Only use env file when needed

containers/hedgedoc.fish

@@ -4,35 +4,19 @@ set -l container_name hedgedoc
 set -l container_volumes_dir ~/volumes/$container_name
 set -l hedgedoc_dir $container_volumes_dir/hedgedoc
 set -l uploads_dir $hedgedoc_dir/uploads
-set -l hedgedoc_env_file ~/sync/volumes/hedgedoc/.env
-set -l private_hedgedoc_env_file $container_volumes_dir/.hedgedoc.env
 
 mkdir -p $uploads_dir
 
 set -l db_container_name hedgedoc-postgres
 set -l db_container_dir $container_volumes_dir/postgres
-set -l db_env_file $container_volumes_dir/.postgres.env
-
-if not test -f $hedgedoc_env_file
-    echo "$hedgedoc_env_file missing"
-    exit 1
-end
-
-if not test -f $private_hedgedoc_env_file
-    echo "$private_hedgedoc_env_file missing"
-    exit 1
-end
-
-if not test -f $db_env_file
-    echo "$db_env_file missing"
-    exit 1
-end
 
 podman-default-create \
     $db_container_name \
     --network traefik \
     -v $db_container_dir:/var/lib/postgresql/data:Z \
-    --env-file $db_env_file \
+    -e POSTGRES_DB=hedgedoc \
+    -e POSTGRES_USER=hedgedoc \
+    --env-file $container_volumes_dir/postgres.env \
     --label "io.containers.autoupdate=registry" \
     docker.io/library/postgres:14-alpine
 
@@ -40,8 +24,22 @@ podman-default-create \
     $container_name \
     --network traefik \
     -v $uploads_dir:/hedgedoc/public/uploads:Z \
-    --env-file $hedgedoc_env_file \
-    --env-file $private_hedgedoc_env_file \
+    -e NODE_ENV=production \
+    -e DEBUG=false \
+    -e CMD_DB_DATABASE=hedgedoc \
+    -e CMD_DB_USERNAME=hedgedoc \
+    -e CMD_DB_HOST=hedgedoc-postgres \
+    -e CMD_DB_PORT=5432 \
+    -e CMD_DB_DIALECT=postgres \
+    -e CMD_PROTOCOL_USESSL=true \
+    -e CMD_CSP_ALLOW_FRAMING=false \
+    -e CMD_CSP_ALLOW_PDF_EMBED=false \
+    -e CMD_ALLOW_GRAVATAR=false \
+    -e CMD_ALLOW_FREEURL=true \
+    -e CMD_ALLOW_ANONYMOUS_EDITS=true \
+    -e CMD_DEFAULT_PERMISSION=freely \
+    -e CMD_DOMAIN=pads.mo8it.com \
+    --env-file $container_volumes_dir/hedgedoc.env \
     --label "io.containers.autoupdate=registry" \
     quay.io/hedgedoc/hedgedoc:alpine
 

containers/limesurvey.fish

@@ -3,18 +3,6 @@
 set -l container_name limesurvey
 set -l container_volumes_dir ~/volumes/$container_name
 set -l container_limesurvey_dir $container_volumes_dir/limesurvey
-set -l limesurvey_env_file $container_volumes_dir/.limesurvey.env
-set -l postgres_env_file $container_volumes_dir/.postgres.env
-
-if not test -f $limesurvey_env_file
-    echo "$limesurvey_env_file missing"
-    exit 1
-end
-
-if not test -f $postgres_env_file
-    echo "$postgres_env_file missing"
-    exit 1
-end
 
 mkdir -p $container_limesurvey_dir
 
@@ -27,14 +15,22 @@ podman-default-create \
     $db_container_name \
     --network traefik \
     -v $db_container_dir:/var/lib/postgresql/data:Z \
-    --env-file $postgres_env_file \
+    -e POSTGRES_DB=limesurvey \
+    -e POSTGRES_USER=limesurvey \
+    --env-file $container_volumes_dir/secrets.env \
     --label "io.containers.autoupdate=registry" \
-    docker.io/library/postgres:14-alpine
+    docker.io/library/postgres:15-alpine
 
 podman-default-create \
     $container_name \
     --network traefik \
     -v $container_limesurvey_dir:/var/www/html/upload/surveys:Z \
-    --env-file $limesurvey_env_file \
+    -e DB_TYPE=pgsql \
+    -e DB_HOST=limesurvey-postgres \
+    -e DB_PORT=5432 \
+    -e DB_NAME=limesurvey \
+    -e DB_USERNAME=limesurvey \
+    -e PUBLIC_URL=https://survey.mo8it.com \
+    --env-file $container_volumes_dir/secrets.env \
     --label "io.containers.autoupdate=registry" \
     docker.io/martialblog/limesurvey:5-apache

volumes/hedgedoc/.env

@@ -1,21 +0,0 @@
-# In private .env:
-# CMD_DB_USERNAME
-# CMD_DB_PASSWORD
-# CMD_DOMAIN
-
-NODE_ENV=production
-DEBUG=false
-
-CMD_DB_DATABASE=hedgedoc
-CMD_DB_HOST=hedgedoc-postgres
-CMD_DB_PORT=5432
-CMD_DB_DIALECT=postgres
-
-CMD_PROTOCOL_USESSL=true
-
-CMD_CSP_ALLOW_FRAMING=false
-CMD_CSP_ALLOW_PDF_EMBED=false
-
-CMD_ALLOW_GRAVATAR=false
-
-CMD_ALLOW_FREEURL=true