fossilfranv/pigallery2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modifying dokcerfiles

Browse Source
This commit is contained in:
Patrik J. Braun 2019-12-23 00:36:20 +01:00
parent 5db8f0a94d
commit 63fd2ff079
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docker/alpine/Dockerfile.build
View File

@ -6,23 +6,22 @@ RUN npm install --unsafe-perm
RUN mkdir -p /app/data/config && \ RUN mkdir -p /app/data/config && \
mkdir -p /app/data/db && \ mkdir -p /app/data/db && \
mkdir -p /app/data/images && \ mkdir -p /app/data/images && \
mkdir -p /app/data/tmp && \ 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'
FROM node:12-alpine FROM node:12-alpine
WORKDIR /app 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 EXPOSE 80
ENV NODE_ENV=production ENV NODE_ENV=production
RUN apk add ffmpeg RUN apk add ffmpeg
COPY --from=builder /app /app 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"] VOLUME ["/app/data/config", "/app/data/db", "/app/data/images", "/app/data/tmp"]
HEALTHCHECK --interval=30s --timeout=10s --retries=4 --start-period=60s \ HEALTHCHECK --interval=30s --timeout=10s --retries=4 --start-period=60s \
CMD wget --quiet --tries=1 --no-check-certificate --spider \ CMD wget --quiet --tries=1 --no-check-certificate --spider \

17
docker/debian-stretch/Dockerfile.build
View File

@ -5,23 +5,22 @@ RUN npm install --unsafe-perm
RUN mkdir -p /app/data/config && \ RUN mkdir -p /app/data/config && \
mkdir -p /app/data/db && \ mkdir -p /app/data/db && \
mkdir -p /app/data/images && \ mkdir -p /app/data/images && \
mkdir -p /app/data/tmp && \ 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'
FROM node:12-stretch-slim FROM node:12-stretch-slim
WORKDIR /app 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 EXPOSE 80
ENV NODE_ENV=production ENV NODE_ENV=production
RUN apt-get update && apt-get install -y ffmpeg RUN apt-get update && apt-get install -y ffmpeg
COPY --from=builder /app /app 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"] VOLUME ["/app/data/config", "/app/data/db", "/app/data/images", "/app/data/tmp"]
HEALTHCHECK --interval=30s --timeout=10s --retries=4 --start-period=60s \ HEALTHCHECK --interval=30s --timeout=10s --retries=4 --start-period=60s \
CMD wget --quiet --tries=1 --no-check-certificate --spider \ CMD wget --quiet --tries=1 --no-check-certificate --spider \

1
src/common/config/private/ConfigClass.ts
View File

@ -26,6 +26,7 @@ export class ConfigClass extends PrivateConfigDefaultsClass implements IPrivateC
} else { } else {
ConfigClass.CONFIG_PATH = path.join(__dirname, './../../../../', configPath); ConfigClass.CONFIG_PATH = path.join(__dirname, './../../../../', configPath);
} }
console.log('using config path:' + ConfigClass.CONFIG_PATH);
} }
} }