Merge branch '2.022.16'

kobotoolbox · Jun 14, 2022 · 9a23049 · 9a23049
2 parents 8887c7c + 6a9c095
commit 9a23049
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/docker-compose.frontend.yml b/docker-compose.frontend.yml
@@ -5,7 +5,7 @@ version: '3'
 
 services:
   kobocat:
-    image: kobotoolbox/kobocat:2.022.08b
+    image: kobotoolbox/kobocat:2.022.16
     hostname: kobocat
     env_file:
       - ../kobo-env/envfile.txt
@@ -108,7 +108,7 @@ services:
           - nginx.internal
 
   enketo_express:
-    image: kobotoolbox/enketo-express-extra-widgets:2.8.1
+    image: kobotoolbox/enketo-express-extra-widgets:3.1.0-widget-fix
     env_file:
       - ../kobo-env/envfile.txt
     environment:
@@ -119,10 +119,6 @@ services:
       # Override Enketo Express icons.
       - ./enketo_express/favicon.ico:/srv/src/enketo_express/public/images/favicon.ico:ro
       - ./enketo_express/icon_180x180.png:/srv/src/enketo_express/public/images/icon_180x180.png:ro
-      - ./.vols/enketo_express/checksum:/srv/src/enketo_express/checksum
-      - ./.vols/enketo_express/build/css:/srv/src/enketo_express/public/css
-      - ./.vols/enketo_express/build/js:/srv/src/enketo_express/public/js/build
-      - ./.vols/enketo_express/build/locales:/srv/src/enketo_express/locales/build
     networks:
       kobo-fe-network:
         aliases:

diff --git a/mongo/upsert_users.sh b/mongo/upsert_users.sh
@@ -98,7 +98,10 @@ if [[ -d "${MONGO_DATA}/" ]] && [[ -n "$(ls -A ${MONGO_DATA})" ]]; then
     # credentials change during setup.
     if [[ -f "${BASE_DIR}/${UPSERT_DB_USERS_TRIGGER_FILE}" ]]; then
         mongod --quiet &
-        sleep 5  # wait for mongo to be ready
+        until (echo > /dev/tcp/127.0.0.1/27017) 2> /dev/null; do
+            echo "Waiting for local MongoDB deamon to start...";
+            sleep 5;
+        done
         delete_old_users
         upsert_users
         mongod --quiet --shutdown