Merge pull request #264 from getodk/release

Release v1.4
getodk · Mar 2, 2022 · 1e90515 · 1e90515
2 parents 24ee74e + b358a52
commit 1e90515
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/client b/client
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
       options:
         max-file: "30"
   pyxform:
-    image: 'ghcr.io/getodk/pyxform-http:v1.7.0'
+    image: 'ghcr.io/getodk/pyxform-http:v1.8.0'
     restart: always
   secrets:
     volumes:

diff --git a/enketo.dockerfile b/enketo.dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/enketo/enketo-express:3.0.4
+FROM ghcr.io/enketo/enketo-express:3.1.0
 
 ENV ENKETO_SRC_DIR=/srv/src/enketo_express
 WORKDIR ${ENKETO_SRC_DIR}
@@ -16,10 +16,6 @@ COPY files/enketo/start-enketo.sh ${ENKETO_SRC_DIR}/start-enketo.sh
 
 RUN apt-get update; apt-get install gettext-base
 
-RUN npm install
-RUN grunt
-RUN npm prune --production
-
 EXPOSE 8005
 
 CMD ./start-enketo.sh
diff --git a/files/service/crontab b/files/service/crontab
@@ -1,3 +1,4 @@
+0 4 * * * root /usr/odk/purge-forms.sh
 0 3 * * * root /usr/odk/run-analytics.sh
 0 2 * * * root /usr/odk/run-backup.sh
 0 1 * * 0 root /usr/odk/reap-sessions.sh
diff --git a/files/service/scripts/purge-forms.sh b/files/service/scripts/purge-forms.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd /usr/odk
+/usr/local/bin/node lib/bin/purge-forms.js >/proc/1/fd/1 2>/proc/1/fd/2
+
diff --git a/server b/server