xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2025-01-14 14:43:17 +08:00
Code Actions Projects Activity

Updating entrypoint to exec form. This also removes support to set config file path from ENV variable. (It was introduced in #130). Should fix: #136

Browse Source
This commit is contained in:
Patrik J. Braun 2020-09-07 00:21:39 +02:00
parent da83d63fa4
commit 586e944d6a
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/alpine/Dockerfile.build
View File

@ -17,7 +17,6 @@ RUN mkdir -p /app/data/config && \
FROM node:12-alpine3.11 as main
WORKDIR /app
ENV NODE_ENV=production \
CONFIG_FILE=/app/data/config/config.json \
# 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 \
@ -25,11 +24,6 @@ ENV NODE_ENV=production \
# flagging dockerized environemnt
PI_DOCKER=true
# after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible
# This trick is needed as entrypoint in exec form does not support ENV variables
# and in shell form ENV variables were not properly passed to pigallry2
RUN echo "#!/usr/bin/env node ./src/backend/index --expose-gc --config-path=${CONFIG_FILE}" > ./entrypoint.sh && \
chmod +x ./entrypoint.sh
EXPOSE 80
RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.11/community/ \
@ -40,4 +34,8 @@ HEALTHCHECK --interval=40s --timeout=30s --retries=3 --start-period=60s \
CMD wget --quiet --tries=1 --no-check-certificate --spider \
http://localhost:80/heartbeat || exit 1
ENTRYPOINT ["./entrypoint.sh"]
# after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible
# Exec form entrypoint is need otherwise (using shell form) ENV variables are not properly passed down to the app
ENTRYPOINT ["node", "./src/backend/index", "--expose-gc", "--config-path=/app/data/config/config.json"]

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

@ -15,7 +15,6 @@ RUN mkdir -p /app/data/config && \
FROM node:12-stretch-slim as main
WORKDIR /app
ENV NODE_ENV=production \
CONFIG_FILE=/app/data/config/config.json \
# 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 \
@ -37,5 +36,7 @@ HEALTHCHECK --interval=40s --timeout=30s --retries=3 --start-period=60s \
CMD wget --quiet --tries=1 --no-check-certificate --spider \
http://localhost:80/heartbeat || exit 1
ENTRYPOINT node ./src/backend/index --expose-gc --config-path=${CONFIG_FILE}
# after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible
# Exec form entrypoint is need otherwise (using shell form) ENV variables are not properly passed down to the app
ENTRYPOINT ["node", "./src/backend/index", "--expose-gc", "--config-path=/app/data/config/config.json"]