From 6768647f11e5211c11ce0e66a058d337ce7905ca Mon Sep 17 00:00:00 2001
From: "Patrik J. Braun" <bra.patrik@gmail.com>
Date: Fri, 11 Mar 2022 23:26:21 +0100
Subject: [PATCH] Removing alpine from armv7. Mixing v15 and edge dependencies
 did not work. #295

---
 .github/workflows/build.yml    | 15 +++++++++++----
 docker/alpine/Dockerfile.build | 11 +++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a7e578cd..6b243df8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -93,6 +93,13 @@ jobs:
     strategy:
       matrix:
         container: [alpine, debian-buster, debian-bullseye ]
+        include:
+          - container: alpine
+            platforms: linux/amd64,linux/arm64
+          - container: debian-buster
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
+          - container: debian-bullseye
+            platforms: linux/amd64,linux/arm64,linux/arm/v7
 
     steps:
       - name: Set tag
@@ -125,7 +132,7 @@ jobs:
         with:
           context: .
           file: docker/${{ matrix.container }}/Dockerfile.build
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: ${{ matrix.platforms }}
           push: true
           tags: bpatrik/pigallery2:experimental-${{ matrix.container }}
       - name: Push nightly on new master commit
@@ -134,7 +141,7 @@ jobs:
         with:
           context: .
           file: docker/${{ matrix.container }}/Dockerfile.build
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: ${{ matrix.platforms }}
           push: true
           tags: bpatrik/pigallery2:nightly-${{ matrix.container }}
       - name: Push release on new Tag
@@ -143,7 +150,7 @@ jobs:
         with:
           context: .
           file: docker/${{ matrix.container }}/Dockerfile.build
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: ${{ matrix.platforms }}
           push: true
           tags: |
             bpatrik/pigallery2:nightly-${{ matrix.container }}
@@ -155,7 +162,7 @@ jobs:
         with:
           context: .
           file: docker/${{ matrix.container }}/Dockerfile.build
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          platforms: ${{ matrix.platforms }}
           push: true
           tags: |
             bpatrik/pigallery2:nightly-${{ matrix.container }}
diff --git a/docker/alpine/Dockerfile.build b/docker/alpine/Dockerfile.build
index 3413a11a..49e11e3a 100644
--- a/docker/alpine/Dockerfile.build
+++ b/docker/alpine/Dockerfile.build
@@ -2,10 +2,7 @@
 #-----------------------------------------
 FROM node:14-alpine3.15 AS builder
 RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.15/community/ \
-  python3 build-base sqlite-dev sqlite-libs fftw-dev gcc g++ make libc6-compat && ln -snf /usr/bin/python3 /usr/bin/python
-
-RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/edge/community/ vips-dev>8.12.2-r3 vips>8.12.2-r3
-
+  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
@@ -28,10 +25,8 @@ ENV NODE_ENV=production \
     PI_DOCKER=true
 
 EXPOSE 80
-RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.15/community/ ffmpeg
-RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/edge/community/  vips>8.12.2-r3
-
-
+RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.15/community/ \
+    vips ffmpeg
 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 \