mirror of
https://github.com/xuthus83/pigallery2.git
synced 2024-11-03 21:04:03 +08:00
Removing alpine from armv7. Mixing v15 and edge dependencies did not work. #295
This commit is contained in:
parent
182eb7d742
commit
6768647f11
15
.github/workflows/build.yml
vendored
15
.github/workflows/build.yml
vendored
@ -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 }}
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user