From f6e665fa793ebfadd13d3bfd2fb809d119febd2d Mon Sep 17 00:00:00 2001 From: "Patrik J. Braun" Date: Sun, 6 Sep 2020 17:27:52 +0200 Subject: [PATCH] Creating entripont.sh as exec form Entrypoint does not support environmental variables. #136 --- docker/alpine/Dockerfile.build | 8 ++++++-- docker/debian-stretch/Dockerfile.build | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docker/alpine/Dockerfile.build b/docker/alpine/Dockerfile.build index 0ac7aa95..827c0fc8 100644 --- a/docker/alpine/Dockerfile.build +++ b/docker/alpine/Dockerfile.build @@ -25,6 +25,11 @@ 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 "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/ \ @@ -35,5 +40,4 @@ 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 -# after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible -ENTRYPOINT ["node", "./src/backend/index", "--expose-gc", "--config-path=${CONFIG_FILE}"] +ENTRYPOINT ["./entrypoint.sh"] diff --git a/docker/debian-stretch/Dockerfile.build b/docker/debian-stretch/Dockerfile.build index fc87840f..733c8ad9 100644 --- a/docker/debian-stretch/Dockerfile.build +++ b/docker/debian-stretch/Dockerfile.build @@ -23,6 +23,11 @@ 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 "node ./src/backend/index --expose-gc --config-path=${CONFIG_FILE}" > ./entrypoint.sh && \ + chmod +x ./entrypoint.sh EXPOSE 80 RUN apt-get update && apt-get install -y ffmpeg @@ -32,6 +37,5 @@ 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 -# after a extensive job (like video converting), pigallery calls gc, to clean up everthing as fast as possible -ENTRYPOINT ["node", "./src/backend/index", "--expose-gc", "--config-path=${CONFIG_FILE}"] +ENTRYPOINT ["./entrypoint.sh"]