Removed dev specific config file for the containers

docker-compose.dev.yml

@@ -24,11 +24,14 @@ services:
   service:
     profiles:
       - enketo
-    depends_on: !reset []
+    depends_on: !override [secrets]
     network_mode: host
     environment:
       - DB_HOST=localhost
       - ENV=DEV
+      - XLSFORM_HOST=127.0.0.1
+      - XLSFORM_PORT=5001
+      - ENKETO_URL=http://localhost:8005/-
   nginx:
     profiles:
       - enketo
@@ -45,7 +48,10 @@ services:
     network_mode: host
   secrets:
     profiles:
-      - none
+      - central
+      - enketo
+    environment:
+      - ENV=DEV
   enketo:
     profiles:
       - central    

docker-compose.yml

@@ -57,6 +57,9 @@ services:
       - DB_PASSWORD=${DB_PASSWORD:-odk}
       - DB_NAME=${DB_NAME:-odk}
       - DB_SSL=${DB_SSL:-null}
+      - XLSFORM_HOST=${XLSFORM_HOST:-pyxform}
+      - XLSFORM_PORT=${XLSFORM_PORT:-80}
+      - ENKETO_URL=${ENKETO_URL:-http://enketo:8005/-}
       - EMAIL_FROM=${EMAIL_FROM:-no-reply@$DOMAIN}
       - EMAIL_HOST=${EMAIL_HOST:-mail}
       - EMAIL_PORT=${EMAIL_PORT:-25}

enketo.dockerfile

@@ -12,7 +12,6 @@ WORKDIR ${ENKETO_SRC_DIR}
 
 COPY files/enketo/config.json.template ${ENKETO_SRC_DIR}/config/config.json.template
 COPY files/enketo/config.json.template ${ENKETO_SRC_DIR}/config/config.json
-COPY files/enketo/config.json.dev.template ${ENKETO_SRC_DIR}/config/config.json.dev.template
 COPY files/enketo/start-enketo.sh ${ENKETO_SRC_DIR}/start-enketo.sh
 
 RUN apt-get update && \

files/enketo/generate-secrets.sh

@@ -12,3 +12,8 @@ if [ ! -f /etc/secrets/enketo-api-key ]; then
   LC_ALL=C tr -dc '[:alnum:]' < /dev/urandom | head -c128 > /etc/secrets/enketo-api-key
 fi
 
+if [ "$ENV" = "DEV" ]; then
+    printf 's0m3v3rys3cr3tk3y' > /etc/secrets/enketo-secret
+    printf 'this $3cr3t key is crackable' > /etc/secrets/enketo-less-secret
+    printf 'enketorules' > /etc/secrets/enketo-api-key
+fi

files/enketo/start-enketo.sh

@@ -3,6 +3,12 @@
 CONFIG_PATH=${ENKETO_SRC_DIR}/config/config.json
 echo "generating enketo configuration..."
 
+if [ "$ENV" = "DEV" ]; then
+    sed -i 's/enketo_redis_main/localhost/g' "$CONFIG_PATH.template"
+    sed -i 's/enketo_redis_cache/localhost/g' "$CONFIG_PATH.template"
+    sed -i 's/6380/6379/g' "$CONFIG_PATH.template"
+fi
+
 BASE_URL=$( [ "${HTTPS_PORT}" = 443 ] && echo https://"${DOMAIN}" || echo https://"${DOMAIN}":"${HTTPS_PORT}" ) \
 SECRET=$(cat /etc/secrets/enketo-secret) \
 LESS_SECRET=$(cat /etc/secrets/enketo-less-secret) \
@@ -11,9 +17,5 @@ envsubst '$DOMAIN $BASE_URL $SECRET $LESS_SECRET $API_KEY $SUPPORT_EMAIL' \
     < "$CONFIG_PATH.template" \
     > "$CONFIG_PATH"
 
-if [ "$ENV" = "DEV" ]; then
-    cp "$CONFIG_PATH.dev.template" "$CONFIG_PATH"
-fi
-
 echo "starting enketo..."
 exec yarn workspace enketo-express start

files/nginx/setup-odk.sh

@@ -16,9 +16,6 @@ if [ "$SSL_TYPE" = "selfsign" ] && [ ! -s "$SELFSIGN_PATH/privkey.pem" ]; then
 fi
 
 TEMPLATE_PATH=/usr/share/odk/nginx/odk.conf.template
-if [ "$ENV" = "DEV" ]; then
-    TEMPLATE_PATH=/usr/share/odk/nginx/odk.conf.dev.template
-fi
 
 # start from fresh templates in case ssl type has changed
 echo "writing fresh nginx templates..."
@@ -35,19 +32,23 @@ else
   if [ "$SSL_TYPE" = "upstream" ]; then
     # no need for letsencrypt challenge reply or 80 to 443 redirection
     rm -f /etc/nginx/conf.d/redirector.conf
-    # strip out all ssl_* directives
-    perl -i -ne 's/listen 443.*/listen 80;/; print if ! /ssl_/' /etc/nginx/conf.d/odk.conf
-    # force https because we expect SSL upstream
-    perl -i -pe 's/X-Forwarded-Proto \$scheme/X-Forwarded-Proto https/;' /etc/nginx/conf.d/odk.conf
+
+    # in DEV we run Central on http
+    if [ "$ENV" = "DEV" ]; then
+      perl -i -ne 's/listen 443.*/listen 8989;/; print if ! /ssl_/' /etc/nginx/conf.d/odk.conf
+      perl -i -pe 's/enketo:8005;/localhost:8005;/;' /etc/nginx/conf.d/odk.conf
+      perl -i -pe 's/service:8383;/localhost:8383;/;' /etc/nginx/conf.d/odk.conf
+    else
+      # strip out all ssl_* directives
+      perl -i -ne 's/listen 443.*/listen 80;/; print if ! /ssl_/' /etc/nginx/conf.d/odk.conf
+      # force https because we expect SSL upstream
+      perl -i -pe 's/X-Forwarded-Proto \$scheme/X-Forwarded-Proto https/;' /etc/nginx/conf.d/odk.conf
+    fi
+
     echo "starting nginx for upstream ssl..."
   else
     # remove letsencrypt challenge reply, but keep 80 to 443 redirection
     perl -i -ne 'print if $. < 7 || $. > 14' /etc/nginx/conf.d/redirector.conf
-
-    if [ "$ENV" = "DEV" ]; then
-        rm -f /etc/nginx/conf.d/redirector.conf
-    fi
-
     echo "starting nginx for custom ssl and self-signed certs..."
   fi
   exec nginx -g "daemon off;"

files/postgres14/start-postgres.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -eu
 set -o pipefail
 
-flag_upgradeCompletedOk=$(readlink -f -m $PGDATA/../.postgres14-upgrade-successful)
+flag_upgradeCompletedOk=$(readlink -f -m "$PGDATA/../.postgres14-upgrade-successful")
 
 logPrefix="$(basename "$0")"
 log() {

files/service/config.json.template

@@ -22,11 +22,11 @@
       }
     },
     "xlsform": {
-      "host": "pyxform",
-      "port": 80
+      "host": "${XLSFORM_HOST}",
+      "port": ${XLSFORM_PORT}
     },
     "enketo": {
-      "url": "http://enketo:8005/-",
+      "url": "${ENKETO_URL}",
       "apiKey": "${ENKETO_API_KEY}"
     },
     "env": {

files/service/scripts/start-odk.sh

@@ -4,13 +4,16 @@ echo "generating local service configuration.."
 
 TEMPLATE_PATH=/usr/share/odk/config.json.template
 
+BASE_URL=$( [ "${HTTPS_PORT}" = 443 ] && echo https://"${DOMAIN}" || echo https://"${DOMAIN}":"${HTTPS_PORT}" )
+
 if [ "$ENV" = "DEV" ]; then
-    TEMPLATE_PATH=/usr/share/odk/config.json.dev.template
+    BASE_URL="http://localhost:8989"
 fi
 
+export BASE_URL
+
 ENKETO_API_KEY=$(cat /etc/secrets/enketo-api-key) \
-BASE_URL=$( [ "${HTTPS_PORT}" = 443 ] && echo https://"${DOMAIN}" || echo https://"${DOMAIN}":"${HTTPS_PORT}" ) \
-envsubst '$DOMAIN $BASE_URL $SYSADMIN_EMAIL $ENKETO_API_KEY $DB_HOST $DB_USER $DB_PASSWORD $DB_NAME $DB_SSL $EMAIL_FROM $EMAIL_HOST $EMAIL_PORT $EMAIL_SECURE $EMAIL_IGNORE_TLS $EMAIL_USER $EMAIL_PASSWORD $OIDC_ENABLED $OIDC_ISSUER_URL $OIDC_CLIENT_ID $OIDC_CLIENT_SECRET $SENTRY_ORG_SUBDOMAIN $SENTRY_KEY $SENTRY_PROJECT' \
+envsubst '$DOMAIN $BASE_URL $SYSADMIN_EMAIL $ENKETO_API_KEY $DB_HOST $DB_USER $DB_PASSWORD $DB_NAME $DB_SSL $EMAIL_FROM $EMAIL_HOST $EMAIL_PORT $EMAIL_SECURE $EMAIL_IGNORE_TLS $EMAIL_USER $EMAIL_PASSWORD $OIDC_ENABLED $OIDC_ISSUER_URL $OIDC_CLIENT_ID $OIDC_CLIENT_SECRET $SENTRY_ORG_SUBDOMAIN $SENTRY_KEY $SENTRY_PROJECT $XLSFORM_HOST $XLSFORM_PORT $ENKETO_URL' \
     < $TEMPLATE_PATH \
     > /usr/odk/config/local.json
 

service.dockerfile

@@ -61,7 +61,6 @@ COPY server/ ./
 COPY files/service/scripts/ ./
 
 COPY files/service/config.json.template /usr/share/odk/
-COPY files/service/config.json.dev.template /usr/share/odk/
 COPY files/service/crontab /etc/cron.d/odk
 COPY files/service/odk-cmd /usr/bin/