From 4063b44cdace679c0402eb0be9604309b37492da Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Wed, 3 May 2017 17:24:00 +0300
Subject: [PATCH] - A little cleanup for Docker's cleanup and update scripts. -
Revert change brought on from running shellcheck, breaks scripts. Instead
explictly turn off said check.
---
Documents/Shore/cleanup/docker-clean | 10 ++++++----
Documents/Shore/cleanup/docker-update | 3 ++-
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documents/Shore/cleanup/docker-clean b/Documents/Shore/cleanup/docker-clean
index 6c9bb73..1a00e1d 100755
--- a/Documents/Shore/cleanup/docker-clean
+++ b/Documents/Shore/cleanup/docker-clean
@@ -1,5 +1,7 @@
#!/bin/sh
-docker rm "$(docker ps --quiet --filter=status=exited)" 2>/dev/null || true
-docker rm "$(docker ps --quiet --filter=status=created)" 2>/dev/null || true
-docker rmi "$(docker images --quiet --filter=dangling=true)" 2>/dev/null || true
-docker volume rm "$(docker volume ls --quiet --filter=dangling=true)" 2>/dev/null || true
+# shellcheck disable=SC2046
+set -u
+docker rm $(docker ps --quiet --filter=status=exited) 2>/dev/null
+docker rm $(docker ps --quiet --filter=status=created) 2>/dev/null
+docker rmi $(docker images --quiet --filter=dangling=true) 2>/dev/null
+docker volume rm $(docker volume ls --quiet --filter=dangling=true) 2>/dev/null
diff --git a/Documents/Shore/cleanup/docker-update b/Documents/Shore/cleanup/docker-update
index 01a2c99..f1d8fda 100755
--- a/Documents/Shore/cleanup/docker-update
+++ b/Documents/Shore/cleanup/docker-update
@@ -1,4 +1,5 @@
-#!/bin/sh -e
+#!/bin/sh
+set -eu
for image in $(docker images | awk '$1!="<none>" && NR>1 {printf("%s:%s\n", $1, $2)}')
do
docker pull "$image" || echo "Skipping..."
--
GitLab