Adding support for neglected env vars

build/generate-crontab.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEFAULT_CRON="0 0 * * *"
+DEFAULT_CRON="0 9 * * *"
 
 if [ "$CRON" ]
 then
@@ -12,11 +12,21 @@ fi
 
 GC_ARGS=""
 
+if [ "$CLEAN_UP_VOLUMES" ]
+then
+   GC_ARGS="$GC_ARGS CLEAN_UP_VOLUMES=$CLEAN_UP_VOLUMES"
+fi
+
 if [ "$DRY_RUN" ]
 then
    GC_ARGS="$GC_ARGS DRY_RUN=$DRY_RUN"
 fi
 
+if [ "$EXCLUDE_VOLUMES_IDS_FILE" ]
+then
+   GC_ARGS="$GC_ARGS EXCLUDE_VOLUMES_IDS_FILE=$EXCLUDE_VOLUMES_IDS_FILE"
+fi
+
 if [ "$FORCE_CONTAINER_REMOVAL" ]
 then
    GC_ARGS="$GC_ARGS FORCE_CONTAINER_REMOVAL=$FORCE_CONTAINER_REMOVAL"
@@ -32,9 +42,9 @@ then
    GC_ARGS="$GC_ARGS GRACE_PERIOD_SECONDS=$GRACE_PERIOD_SECONDS"
 fi
 
-if [ "$CLEAN_UP_VOLUMES" ]
+if [ "$MINIMUM_IMAGES_TO_SAVE" ]
 then
-   GC_ARGS="$GC_ARGS CLEAN_UP_VOLUMES=$CLEAN_UP_VOLUMES"
+   GC_ARGS="$GC_ARGS MINIMUM_IMAGES_TO_SAVE=$MINIMUM_IMAGES_TO_SAVE"
 fi
 
 echo -e "$CRON" "$GC_ARGS sh /executed-by-cron.sh" '>> /var/log/cron.log 2>&1'"\n" > crontab.tmp

compose/docker-compose.yml

@@ -8,7 +8,7 @@ dockergc:
         - ./docker-gc-exclude:/etc/docker-gc-exclude
     environment:
         # By default, docker-gc is run every night at midnight. Change this variable to override.
-        - CRON=0 0 * * *
+        - CRON=0 9,21 * * *
 
         # By default, docker will not remove an image if it is tagged in multiple repositories. If
         # you have a server running docker where this is the case, for example in CI environments 
@@ -18,7 +18,7 @@ dockergc:
         # By default, if an error is encountered when cleaning up a container, Docker will report the
         # error back and leave it on disk. This can sometimes lead to containers accumulating. If
         # you run into this issue, you can force the removal of the container by setting this flag.
-        - FORCE_CONTAINER_REMOVAL=0
+        - FORCE_CONTAINER_REMOVAL=1
 
         # By default, docker-gc will not remove a container if it exited less than 1 hour ago.
         # Set the GRACE_PERIOD_SECONDS variable to override this default.

compose/docker-gc-exclude

@@ -6,5 +6,6 @@
 #
 ####################################################################################################
 
-clockworksoul/docker-gc-cron:latest
-e61267dbe31b    
+clockworksoul/docker-gc-cron:latest    
+
+jupyter/tensorflow-notebook:latest