Merge pull request #10 from codefresh-io/dockerd_restart

Dockerd restart

Author: kosta709

cleaner/cleaner-agent.sh

@@ -99,6 +99,8 @@ do
     (( CLEANER_AGENT_ACTIONS_PURGES ++ ))
     echo "$0: CLEANER_AGENT_ACTIONS_PURGES=$CLEANER_AGENT_ACTIONS_PURGES, updating metric file ${CLEANER_AGENT_ACTIONS_PURGES_FILE}"
     echo $CLEANER_AGENT_ACTIONS_PURGES > ${CLEANER_AGENT_ACTIONS_PURGES_FILE}
+    echo "docker pull pulling codefresh/fs-ops"
+    docker pull codefresh/fs-ops
     unlock_file
     display_df
   fi

cleaner/docker-clean-sigterm.sh

@@ -100,11 +100,11 @@ else
 fi
 
 check_disk_usage_threshold(){
-   df ${DOCKERD_DATA_ROOT} | awk -v T=${DISK_USAGE_THRESHOLD} 'NR==2 {print ( $3 / $2  > T ) ? "1": "0" }'
+   df -P ${DOCKERD_DATA_ROOT} | awk -v T=${DISK_USAGE_THRESHOLD} 'NR==2 {print ( $3 / $2  > T ) ? "1": "0" }'
 }
 
 check_inodes_usage_threshold(){
-   df -i ${DOCKERD_DATA_ROOT} | awk -v T=${INODES_USAGE_THRESHOLD} 'NR==2 {print ( $3 / $2  > T ) ? "1": "0" }'
+   df -iP ${DOCKERD_DATA_ROOT} | awk -v T=${INODES_USAGE_THRESHOLD} 'NR==2 {print ( $3 / $2  > T ) ? "1": "0" }'
 }
 
 echo -e "\nChecking if  need to clean by current disk usage - DISK_USAGE_THRESHOLD = ${DISK_USAGE_THRESHOLD}"

cleaner/docker-clean.sh

@@ -86,11 +86,11 @@ else
 fi
 
 check_disk_usage_threshold(){
-   df ${DOCKERD_DATA_ROOT} | awk -v T=${DISK_USAGE_THRESHOLD} 'NR==2 {print ( $3 / $2  > T ) ? "1": "0" }'
+   df -P ${DOCKERD_DATA_ROOT} | awk -v T=${DISK_USAGE_THRESHOLD} 'NR==2 {print ( $3 / $2  > T ) ? "1": "0" }'
 }
 
 check_inodes_usage_threshold(){
-   df -i ${DOCKERD_DATA_ROOT} | awk -v T=${INODES_USAGE_THRESHOLD} 'NR==2 {print ( $3 / $2  > T ) ? "1": "0" }'
+   df -iP ${DOCKERD_DATA_ROOT} | awk -v T=${INODES_USAGE_THRESHOLD} 'NR==2 {print ( $3 / $2  > T ) ? "1": "0" }'
 }
 
 echo -e "\nChecking if  need to clean by current disk usage - DISK_USAGE_THRESHOLD = ${DISK_USAGE_THRESHOLD}"

cleaner/functions.sh

@@ -41,12 +41,12 @@ display_df(){
 
 check_disk_usage_threshold(){
   local THRESHOLD=${1:-${DISK_USAGE_THRESHOLD}}
-  df ${DOCKERD_DATA_ROOT} | awk -v T=${THRESHOLD} 'NR==2 {print ( $3 / $2  > T ) ? "1": "0" }'
+  df -P ${DOCKERD_DATA_ROOT} | awk -v T=${THRESHOLD} 'NR==2 {print ( $3 / $2  > T ) ? "1": "0" }'
 }
 
 check_inodes_usage_threshold(){
   local THRESHOLD=${1:-${DISK_USAGE_THRESHOLD}}
-   df -i ${DOCKERD_DATA_ROOT} | awk -v T=${THRESHOLD} 'NR==2 {print ( $3 / $2  > T ) ? "1": "0" }'
+   df -iP ${DOCKERD_DATA_ROOT} | awk -v T=${THRESHOLD} 'NR==2 {print ( $3 / $2  > T ) ? "1": "0" }'
 }
 
 clean_temporary_objects(){
@@ -176,8 +176,15 @@ clean_images(){
      done
   fi
 
+  # Added preserved images
+  PRESERVED_IMAGES_FILE=${DIR}/preserved-images
+  if [[ -f "${PRESERVED_IMAGES_FILE}" ]]; then
+    cat ${PRESERVED_IMAGES_FILE} | while read image_name
+    do
+      echo "preserving image $image_name "
+      docker images ${image_name} -q --no-trunc >> "${RETAINED_IMAGES_FILE}"
+    done
+  fi
+
   dind-cleaner images --retained-images-file ${RETAINED_IMAGES_FILE} --image-retain-period ${IMAGE_RETAIN_PERIOD}
 }
-
-
-

cleaner/preserved-images

@@ -0,0 +1 @@
+codefresh/fs-ops