From c1535b54116305eed619916a8472d32ee846952b Mon Sep 17 00:00:00 2001 From: Dedy Martadinata S Date: Wed, 19 May 2021 05:59:47 +0700 Subject: [PATCH 1/3] Update deps for alpine 3.13 Change python to python2 --- docker/alpine/Dockerfile.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/alpine/Dockerfile.build b/docker/alpine/Dockerfile.build index aafdeb1b..be48da01 100644 --- a/docker/alpine/Dockerfile.build +++ b/docker/alpine/Dockerfile.build @@ -1,17 +1,18 @@ #-----------------BUILDER----------------- #----------------------------------------- FROM node:14-alpine3.13 AS builder +ARG VERSION RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.13/community/ \ - python build-base sqlite-dev sqlite-libs vips-dev fftw-dev gcc g++ make libc6-compat -COPY pigallery2-release /app + python2 build-base sqlite-dev sqlite-libs vips-dev fftw-dev gcc g++ make libc6-compat unzip WORKDIR /app +ADD https://github.com/bpatrik/pigallery2/releases/download/$VERSION/pigallery2-release.zip /app +RUN unzip pigallery2-release.zip -d /app RUN npm install --unsafe-perm RUN mkdir -p /app/data/config && \ mkdir -p /app/data/db && \ mkdir -p /app/data/images && \ mkdir -p /app/data/tmp - #-----------------MAIN-------------------- #----------------------------------------- FROM node:14-alpine3.13 AS main @@ -23,16 +24,15 @@ ENV NODE_ENV=production \ default-Server-Media-tempFolder=/app/data/tmp \ # flagging dockerized environemnt PI_DOCKER=true - EXPOSE 80 RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.13/community/ \ vips ffmpeg -COPY --from=builder /app /app +COPY --from=builder --chown=node:node /app /app +USER node VOLUME ["/app/data/config", "/app/data/db", "/app/data/images", "/app/data/tmp"] 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 # 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"] From 996b77eb7b0fc36874ab0c345c997008ae987d32 Mon Sep 17 00:00:00 2001 From: Dedy Martadinata S Date: Wed, 19 May 2021 09:54:43 +0700 Subject: [PATCH 2/3] Change python to python2 As python in alpine 3.11 is version 2.x.x and python in alpine 3.13 have two python versions ```python3``` and ```python2```. --- docker/alpine/Dockerfile.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/alpine/Dockerfile.build b/docker/alpine/Dockerfile.build index be48da01..56a8f948 100644 --- a/docker/alpine/Dockerfile.build +++ b/docker/alpine/Dockerfile.build @@ -1,18 +1,17 @@ #-----------------BUILDER----------------- #----------------------------------------- FROM node:14-alpine3.13 AS builder -ARG VERSION RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.13/community/ \ - python2 build-base sqlite-dev sqlite-libs vips-dev fftw-dev gcc g++ make libc6-compat unzip + python2 build-base sqlite-dev sqlite-libs vips-dev fftw-dev gcc g++ make libc6-compat +COPY pigallery2-release /app WORKDIR /app -ADD https://github.com/bpatrik/pigallery2/releases/download/$VERSION/pigallery2-release.zip /app -RUN unzip pigallery2-release.zip -d /app RUN npm install --unsafe-perm RUN mkdir -p /app/data/config && \ mkdir -p /app/data/db && \ mkdir -p /app/data/images && \ mkdir -p /app/data/tmp + #-----------------MAIN-------------------- #----------------------------------------- FROM node:14-alpine3.13 AS main @@ -24,15 +23,16 @@ ENV NODE_ENV=production \ default-Server-Media-tempFolder=/app/data/tmp \ # flagging dockerized environemnt PI_DOCKER=true + EXPOSE 80 RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.13/community/ \ vips ffmpeg -COPY --from=builder --chown=node:node /app /app -USER node +COPY --from=builder /app /app VOLUME ["/app/data/config", "/app/data/db", "/app/data/images", "/app/data/tmp"] 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 # 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"] From 7c337fb1e741c6fb3f9f17e1296e44d6cbf8b122 Mon Sep 17 00:00:00 2001 From: Dedy Martadinata S Date: Thu, 20 May 2021 08:02:13 +0700 Subject: [PATCH 3/3] Add linking for python3 As in alpine /usr/bin/python owned by python2, workaround by linking /usr/bin/python3 to /usr/bin/python --- docker/alpine/Dockerfile.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/alpine/Dockerfile.build b/docker/alpine/Dockerfile.build index 56a8f948..2733a4d4 100644 --- a/docker/alpine/Dockerfile.build +++ b/docker/alpine/Dockerfile.build @@ -2,7 +2,7 @@ #----------------------------------------- FROM node:14-alpine3.13 AS builder RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.13/community/ \ - python2 build-base sqlite-dev sqlite-libs vips-dev fftw-dev gcc g++ make libc6-compat + python3 build-base sqlite-dev sqlite-libs vips-dev fftw-dev gcc g++ make libc6-compat && ln -snf /usr/bin/python3 /usr/bin/python COPY pigallery2-release /app WORKDIR /app RUN npm install --unsafe-perm