From ffba3c3aef5300be1a30a92dda3ec9967b28720c Mon Sep 17 00:00:00 2001 From: "Patrik J. Braun" Date: Sat, 7 Jan 2023 13:33:19 +0100 Subject: [PATCH] trying alpine v3.17 on linux/arm/v7 #295 --- .github/workflows/build.yml | 2 +- docker/alpine/Dockerfile.build | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00ebf50d..304add46 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,7 +95,7 @@ jobs: container: [alpine, debian-buster, debian-bullseye ] include: - container: alpine - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 - container: debian-buster platforms: linux/amd64,linux/arm64,linux/arm/v7 - container: debian-bullseye diff --git a/docker/alpine/Dockerfile.build b/docker/alpine/Dockerfile.build index 640481c1..670ec322 100644 --- a/docker/alpine/Dockerfile.build +++ b/docker/alpine/Dockerfile.build @@ -1,7 +1,7 @@ #-----------------BUILDER----------------- #----------------------------------------- -FROM node:18-alpine3.16 AS builder -RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.16/community/ \ +FROM node:18-alpine3.17 AS builder +RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.17/community/ \ 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 @@ -14,7 +14,7 @@ RUN mkdir -p /app/data/config && \ #-----------------MAIN-------------------- #----------------------------------------- -FROM node:18-alpine3.16 AS main +FROM node:18-alpine3.17 AS main WORKDIR /app ENV NODE_ENV=production \ # overrides only the default value of the settings (the actualy value can be overwritten through config.json) @@ -25,7 +25,7 @@ ENV NODE_ENV=production \ PI_DOCKER=true EXPOSE 80 -RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.16/community/ \ +RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.17/community/ \ vips ffmpeg COPY --from=builder /app /app VOLUME ["/app/data/config", "/app/data/db", "/app/data/images", "/app/data/tmp"]