xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

Removing alpine from armv7. Mixing v15 and edge dependencies did not work. #295

Browse Source
This commit is contained in:
Patrik J. Braun 2022-03-11 23:26:21 +01:00
parent 182eb7d742
commit 6768647f11
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/build.yml vendored
View File

@ -93,6 +93,13 @@ jobs:
strategy: strategy:
matrix: matrix:
container: [alpine, debian-buster, debian-bullseye ] 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: steps:
- name: Set tag - name: Set tag
@ -125,7 +132,7 @@ jobs:
with: with:
context: . context: .
file: docker/${{ matrix.container }}/Dockerfile.build file: docker/${{ matrix.container }}/Dockerfile.build
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: ${{ matrix.platforms }}
push: true push: true
tags: bpatrik/pigallery2:experimental-${{ matrix.container }} tags: bpatrik/pigallery2:experimental-${{ matrix.container }}
- name: Push nightly on new master commit - name: Push nightly on new master commit
@ -134,7 +141,7 @@ jobs:
with: with:
context: . context: .
file: docker/${{ matrix.container }}/Dockerfile.build file: docker/${{ matrix.container }}/Dockerfile.build
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: ${{ matrix.platforms }}
push: true push: true
tags: bpatrik/pigallery2:nightly-${{ matrix.container }} tags: bpatrik/pigallery2:nightly-${{ matrix.container }}
- name: Push release on new Tag - name: Push release on new Tag
@ -143,7 +150,7 @@ jobs:
with: with:
context: . context: .
file: docker/${{ matrix.container }}/Dockerfile.build file: docker/${{ matrix.container }}/Dockerfile.build
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: ${{ matrix.platforms }}
push: true push: true
tags: | tags: |
bpatrik/pigallery2:nightly-${{ matrix.container }} bpatrik/pigallery2:nightly-${{ matrix.container }}
@ -155,7 +162,7 @@ jobs:
with: with:
context: . context: .
file: docker/${{ matrix.container }}/Dockerfile.build file: docker/${{ matrix.container }}/Dockerfile.build
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: ${{ matrix.platforms }}
push: true push: true
tags: | tags: |
bpatrik/pigallery2:nightly-${{ matrix.container }} bpatrik/pigallery2:nightly-${{ matrix.container }}

11
docker/alpine/Dockerfile.build
View File

@ -2,10 +2,7 @@
#----------------------------------------- #-----------------------------------------
FROM node:14-alpine3.15 AS builder FROM node:14-alpine3.15 AS builder
RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/v3.15/community/ \ 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 python3 build-base sqlite-dev sqlite-libs vips-dev 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
COPY pigallery2-release /app COPY pigallery2-release /app
WORKDIR /app WORKDIR /app
RUN npm install --unsafe-perm RUN npm install --unsafe-perm
@ -28,10 +25,8 @@ ENV NODE_ENV=production \
PI_DOCKER=true PI_DOCKER=true
EXPOSE 80 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/v3.15/community/ \
RUN apk add --update-cache --repository https://alpine.global.ssl.fastly.net/alpine/edge/community/ vips>8.12.2-r3 vips ffmpeg
COPY --from=builder /app /app COPY --from=builder /app /app
VOLUME ["/app/data/config", "/app/data/db", "/app/data/images", "/app/data/tmp"] VOLUME ["/app/data/config", "/app/data/db", "/app/data/images", "/app/data/tmp"]
HEALTHCHECK --interval=40s --timeout=30s --retries=3 --start-period=60s \ HEALTHCHECK --interval=40s --timeout=30s --retries=3 --start-period=60s \