1
0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00

Merge pull request #130 from Suika/docker-env

Use ENV to set important paths
This commit is contained in:
Patrik J. Braun 2020-01-28 10:40:27 +01:00 committed by GitHub
commit 62ba847123
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 15 deletions

View File

@ -16,16 +16,17 @@ RUN mkdir -p /app/data/config && \
#----------------------------------------- #-----------------------------------------
FROM node:12-alpine3.11 as main FROM node:12-alpine3.11 as main
WORKDIR /app 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
# command line arg orverride the config.json with these settings # command line arg orverride the config.json with these settings
ENTRYPOINT ["node", "./src/backend/index", \ ENTRYPOINT ["node", "./src/backend/index", \
# after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible # after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible
"--expose-gc", \ "--expose-gc", \
"--config-path=/app/data/config/config.json", \ "--config-path=$CONFIG_FILE"]
"--Server-Database-dbFolder=/app/data/db", \
"--Server-Media-folder=/app/data/images", \
"--Server-Media-tempFolder=/app/data/tmp"]
EXPOSE 80 EXPOSE 80
ENV NODE_ENV=production
RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.11/community/ \ RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.11/community/ \
vips ffmpeg vips ffmpeg
COPY --from=builder /app /app COPY --from=builder /app /app

View File

@ -14,16 +14,17 @@ RUN mkdir -p /app/data/config && \
#----------------------------------------- #-----------------------------------------
FROM node:12-stretch-slim as main FROM node:12-stretch-slim as main
WORKDIR /app 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
# command line arg orverride the config.json with these settings # command line arg orverride the config.json with these settings
ENTRYPOINT ["node", "./src/backend/index", \ ENTRYPOINT ["node", "./src/backend/index", \
# after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible # after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible
"--expose-gc", \ "--expose-gc", \
"--config-path=/app/data/config/config.json", \ "--config-path=$CONFIG_FILE"]
"--Server-Database-dbFolder=/app/data/db", \
"--Server-Media-folder=/app/data/images", \
"--Server-Media-tempFolder=/app/data/tmp"]
EXPOSE 80 EXPOSE 80
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
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"]

View File

@ -14,15 +14,16 @@ RUN set -x && npm install --unsafe-perm && \
FROM node:12-stretch-slim FROM node:12-stretch-slim
WORKDIR /app 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
ENTRYPOINT ["npm", "start", "--", \ ENTRYPOINT ["npm", "start", "--", \
# after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible # after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible
"--expose-gc", \ "--expose-gc", \
"--config-path=/app/data/config/config.json", \ "--config-path=$CONFIG_FILE"]
"--Server-Database-dbFolder=/app/data/db", \
"--Server-Media-folder=/app/data/images", \
"--Server-Media-tempFolder=/app/data/tmp"]
EXPOSE 80 EXPOSE 80
ENV NODE_ENV=production
COPY --from=BUILDER /build/release /app COPY --from=BUILDER /build/release /app
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 \