From 63fd2ff0798e427bc6bec349fd8f0b6f1dca73cd Mon Sep 17 00:00:00 2001
From: "Patrik J. Braun" <bra.patrik@gmail.com>
Date: Mon, 23 Dec 2019 00:36:20 +0100
Subject: [PATCH] modifying dokcerfiles

---
 docker/alpine/Dockerfile.build           | 17 ++++++++---------
 docker/debian-stretch/Dockerfile.build   | 17 ++++++++---------
 src/common/config/private/ConfigClass.ts |  1 +
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/docker/alpine/Dockerfile.build b/docker/alpine/Dockerfile.build
index 20c661f..3984260 100644
--- a/docker/alpine/Dockerfile.build
+++ b/docker/alpine/Dockerfile.build
@@ -6,23 +6,22 @@ RUN npm install --unsafe-perm
 RUN mkdir -p /app/data/config && \
     mkdir -p /app/data/db && \
     mkdir -p /app/data/images && \
-    mkdir -p /app/data/tmp && \
-    npm start -- --config-only --force-rewrite-config \
-    --config-path=/app/data/config/config.json \
-    --Server-Database-sqlite-storage='/app/data/db/sqlite.db' \
-    --Server-Database-memory-usersFile='/app/data/db/users.db' \
-    --Server-Media-folder='/app/data/images' \
-    --Server-Media-tempFolder='/app/data/tmp'
+    mkdir -p /app/data/tmp
 
 
 FROM node:12-alpine
 WORKDIR /app
-ENTRYPOINT ["npm", "start"]
+# command line arg orverride the config.json with these settings
+ENTRYPOINT ["npm", "start",  "--",
+  "--config-path=/app/data/config/config.json",
+  "--Server-Database-sqlite-storage='/app/data/db/sqlite.db'",
+  "--Server-Database-memory-usersFile='/app/data/db/users.db'",
+  "--Server-Media-folder='/app/data/images'",
+  "--Server-Media-tempFolder='/app/data/tmp'"]
 EXPOSE 80
 ENV NODE_ENV=production
 RUN apk add ffmpeg
 COPY --from=builder /app /app
-RUN ln -s /app/data/config/config.json config.json
 VOLUME ["/app/data/config", "/app/data/db", "/app/data/images", "/app/data/tmp"]
 HEALTHCHECK --interval=30s --timeout=10s --retries=4 --start-period=60s \
   CMD wget --quiet --tries=1 --no-check-certificate --spider \
diff --git a/docker/debian-stretch/Dockerfile.build b/docker/debian-stretch/Dockerfile.build
index a7e0e44..e87a966 100644
--- a/docker/debian-stretch/Dockerfile.build
+++ b/docker/debian-stretch/Dockerfile.build
@@ -5,23 +5,22 @@ RUN npm install --unsafe-perm
 RUN mkdir -p /app/data/config && \
     mkdir -p /app/data/db && \
     mkdir -p /app/data/images && \
-    mkdir -p /app/data/tmp && \
-    npm start -- --config-only --force-rewrite-config \
-    --config-path=/app/data/config/config.json \
-    --Server-Database-sqlite-storage='/app/data/db/sqlite.db' \
-    --Server-Database-memory-usersFile='/app/data/db/users.db' \
-    --Server-Media-folder='/app/data/images' \
-    --Server-Media-tempFolder='/app/data/tmp'
+    mkdir -p /app/data/tmp
 
 
 FROM node:12-stretch-slim
 WORKDIR /app
-ENTRYPOINT ["npm", "start"]
+# command line arg orverride the config.json with these settings
+ENTRYPOINT ["npm", "start",  "--",
+  "--config-path=/app/data/config/config.json",
+  "--Server-Database-sqlite-storage='/app/data/db/sqlite.db'",
+  "--Server-Database-memory-usersFile='/app/data/db/users.db'",
+  "--Server-Media-folder='/app/data/images'",
+  "--Server-Media-tempFolder='/app/data/tmp'"]
 EXPOSE 80
 ENV NODE_ENV=production
 RUN apt-get update && apt-get install -y ffmpeg
 COPY --from=builder /app /app
-RUN ln -s /app/data/config/config.json config.json
 VOLUME ["/app/data/config", "/app/data/db", "/app/data/images", "/app/data/tmp"]
 HEALTHCHECK --interval=30s --timeout=10s --retries=4 --start-period=60s \
   CMD wget --quiet --tries=1 --no-check-certificate --spider \
diff --git a/src/common/config/private/ConfigClass.ts b/src/common/config/private/ConfigClass.ts
index 08f0ad8..f0a0ace 100644
--- a/src/common/config/private/ConfigClass.ts
+++ b/src/common/config/private/ConfigClass.ts
@@ -26,6 +26,7 @@ export class ConfigClass extends PrivateConfigDefaultsClass implements IPrivateC
       } else {
         ConfigClass.CONFIG_PATH = path.join(__dirname, './../../../../', configPath);
       }
+      console.log('using config path:' + ConfigClass.CONFIG_PATH);
     }
   }