From 04179f93b73fe2338597f4e08754adc187c63e23 Mon Sep 17 00:00:00 2001 From: "Patrik J. Braun" Date: Fri, 7 Feb 2020 14:03:03 +0100 Subject: [PATCH] upgrading the docker files to only set default values --- docker/alpine/Dockerfile.build | 7 ++++--- docker/debian-stretch/Dockerfile.build | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docker/alpine/Dockerfile.build b/docker/alpine/Dockerfile.build index a60dd72a..70d55c88 100644 --- a/docker/alpine/Dockerfile.build +++ b/docker/alpine/Dockerfile.build @@ -18,9 +18,10 @@ FROM node:12-alpine3.11 as main WORKDIR /app ENV NODE_ENV=production \ CONFIG_FILE=/app/data/config/config.json \ - Server-Database-dbFolder=/app/data/db \ - Server-Media-folder=/app/data/images \ - Server-Media-tempFolder=/app/data/tmp + # overrides only the default value of the settings (the actualy value can be overwritten through config.json) + default-Server-Database-dbFolder=/app/data/db \ + default-Server-Media-folder=/app/data/images \ + default-Server-Media-tempFolder=/app/data/tmp # command line arg orverride the config.json with these settings ENTRYPOINT ["node", "./src/backend/index", \ # after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible diff --git a/docker/debian-stretch/Dockerfile.build b/docker/debian-stretch/Dockerfile.build index c3b422f1..d29d78ff 100644 --- a/docker/debian-stretch/Dockerfile.build +++ b/docker/debian-stretch/Dockerfile.build @@ -16,9 +16,10 @@ FROM node:12-stretch-slim as main WORKDIR /app ENV NODE_ENV=production \ CONFIG_FILE=/app/data/config/config.json \ - Server-Database-dbFolder=/app/data/db \ - Server-Media-folder=/app/data/images \ - Server-Media-tempFolder=/app/data/tmp + # overrides only the default value of the settings (the actualy value can be overwritten through config.json) + default-Server-Database-dbFolder=/app/data/db \ + default-Server-Media-folder=/app/data/images \ + default-Server-Media-tempFolder=/app/data/tmp # command line arg orverride the config.json with these settings ENTRYPOINT ["node", "./src/backend/index", \ # after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible