🍒 Merge changes from PR #317 to release-v1.6.1

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 1.6.1 (TBD)
 
+### Bug fixes
+
+- We make sure that the automatic cleanup job only runs before deployment (instead of cron schedule cleanup).
+
 ## 1.6.0
 
 ### Breaking changes

infrastructure/deployment/deploy.sh

@@ -268,6 +268,11 @@ split_and_join() {
    SPLIT=$(echo $text | sed -e "s/$separator_for_splitting/$separator_for_joining/g")
    echo $SPLIT
 }
+cleanup_docker_images()
+{
+   echo "Cleaning up the docker images"
+   /usr/bin/docker system prune -af | sudo tee -a /var/log/docker-prune.log > /dev/null
+}
 
 docker_stack_deploy() {
   echo "Deploying this environment: $ENVIRONMENT_COMPOSE"
@@ -378,6 +383,8 @@ configured_ssh "/opt/opencrvs/infrastructure/setup-deploy-config.sh $HOST"
 
 rotate_secrets
 
+cleanup_docker_images
+
 docker_stack_deploy
 
 echo

infrastructure/server-setup/tasks/docker.yml

@@ -45,9 +45,8 @@
   cron:
     user: '{{ crontab_user }}'
     name: 'cleanup docker images'
-    minute: '0'
-    hour: '0'
     job: '/usr/bin/docker system prune -af >> /var/log/docker-prune.log'
+    state: absent
 
 - name: Check if Docker group exists
   command: getent group docker