🍒 Merge changes from PR #320 to release-v1.6.1 (#321)

Co-authored-by: Riku Rouvila <[email protected]>

Author: ocrvs-bot

CHANGELOG.md

@@ -5,6 +5,8 @@
 ### Bug fixes
 
 - We make sure that the automatic cleanup job only runs before deployment (instead of cron schedule cleanup).
+- Previously it was possible MongoDB replica set and users were left randomly uninitialised after a deployment. MongoDB initialisation container now retries on failure.
+- On some machines 'file' utility was not preinstalled causing provision to fail. We now install the utility if it doesn't exist.
 
 ## 1.6.0
 

infrastructure/docker-compose.deploy.yml

@@ -226,8 +226,11 @@ services:
       labels:
         - traefik.enable=false
       replicas: 1
+      # If this doesn't get run successfully, both the replica set in mongo and
+      # the user schema remains uninitialized.
       restart_policy:
-        condition: none
+        condition: on-failure
+        delay: 10s
     environment:
       - REPLICAS=1
       - MONGODB_ADMIN_USER=${MONGODB_ADMIN_USER}

infrastructure/server-setup/tasks/swap.yml

@@ -14,6 +14,13 @@
   tags:
     - swap.file.permissions
 
+- name: Ensure 'file' utility is installed
+  ansible.builtin.package:
+    name: file
+    state: present
+  tags:
+    - swap.file.mkswap
+
 - name: 'Check swap file type'
   command: file {{ swap_file_path }}
   register: swapfile