1
0
mirror of https://github.com/xuthus83/pigallery2.git synced 2025-01-14 14:43:17 +08:00

Some options can pull from ENV

This commit is contained in:
suika 2020-01-28 03:09:38 +01:00
parent 9a23523ae4
commit 9afdbc855a
3 changed files with 12 additions and 21 deletions

View File

@ -18,17 +18,14 @@ FROM node:12-alpine3.11 as main
WORKDIR /app WORKDIR /app
ENV NODE_ENV=production \ ENV NODE_ENV=production \
CONFIG_FILE=/app/data/config/config.json \ CONFIG_FILE=/app/data/config/config.json \
DB_PATH=/app/data/db \ Server-Database-dbFolder=/app/data/db \
MEDIA_PATH=/app/data/images \ Server-Media-folder=/app/data/images \
TEMP_PATH=/app/data/tmp 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=$CONFIG_FILE", \ "--config-path=$CONFIG_FILE"]
"--Server-Database-dbFolder=$DB_PATH", \
"--Server-Media-folder=$MEDIA_PATH", \
"--Server-Media-tempFolder=$TEMP_PATH"]
EXPOSE 80 EXPOSE 80
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

View File

@ -16,17 +16,14 @@ FROM node:12-stretch-slim as main
WORKDIR /app WORKDIR /app
ENV NODE_ENV=production \ ENV NODE_ENV=production \
CONFIG_FILE=/app/data/config/config.json \ CONFIG_FILE=/app/data/config/config.json \
DB_PATH=/app/data/db \ Server-Database-dbFolder=/app/data/db \
MEDIA_PATH=/app/data/images \ Server-Media-folder=/app/data/images \
TEMP_PATH=/app/data/tmp 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=$CONFIG_FILE", \ "--config-path=$CONFIG_FILE"]
"--Server-Database-dbFolder=$DB_PATH", \
"--Server-Media-folder=$MEDIA_PATH", \
"--Server-Media-tempFolder=$TEMP_PATH"]
EXPOSE 80 EXPOSE 80
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

View File

@ -16,16 +16,13 @@ FROM node:12-stretch-slim
WORKDIR /app WORKDIR /app
ENV NODE_ENV=production \ ENV NODE_ENV=production \
CONFIG_FILE=/app/data/config/config.json \ CONFIG_FILE=/app/data/config/config.json \
DB_PATH=/app/data/db \ Server-Database-dbFolder=/app/data/db \
MEDIA_PATH=/app/data/images \ Server-Media-folder=/app/data/images \
TEMP_PATH=/app/data/tmp 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=$CONFIG_FILE", \ "--config-path=$CONFIG_FILE"]
"--Server-Database-dbFolder=$DB_PATH", \
"--Server-Media-folder=$MEDIA_PATH", \
"--Server-Media-tempFolder=$TEMP_PATH"]
EXPOSE 80 EXPOSE 80
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"]