Fixed Docker image build

This commit is contained in:
squidfunk 2023-08-21 21:52:26 +02:00
parent 46ca6c5418
commit 0dcb2c9ff5
No known key found for this signature in database
GPG Key ID: 5ED40BC4F9C436DF
2 changed files with 10 additions and 5 deletions

View File

@ -23,6 +23,7 @@ on:
push: push:
branches: branches:
- master - master
- fix/docker-build
pull_request: pull_request:
release: release:
types: types:
@ -106,14 +107,14 @@ jobs:
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v2
- name: Login to DockerHub - name: Login to DockerHub
if: github.event_name == 'release' #if: github.event_name == 'release'
uses: docker/login-action@v2 uses: docker/login-action@v2
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
if: github.event_name == 'release' #if: github.event_name == 'release'
uses: docker/login-action@v2 uses: docker/login-action@v2
with: with:
registry: ghcr.io registry: ghcr.io
@ -153,7 +154,7 @@ jobs:
docker run --rm -i -v ${PWD}:/docs ${REPO_FULL_NAME,,}:${{ steps.meta.outputs.version }} build docker run --rm -i -v ${PWD}:/docs ${REPO_FULL_NAME,,}:${{ steps.meta.outputs.version }} build
- name: Set platforms - name: Set platforms
if: github.event_name == 'release' #if: github.event_name == 'release'
run: | run: |
echo "PLATFORMS=linux/amd64,linux/arm64,linux/arm/v7" >> $GITHUB_ENV echo "PLATFORMS=linux/amd64,linux/arm64,linux/arm/v7" >> $GITHUB_ENV
@ -167,12 +168,12 @@ jobs:
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
- name: Check manifest - name: Check manifest
if: github.event_name == 'release' #if: github.event_name == 'release'
run: | run: |
docker buildx imagetools inspect ${{ github.event.repository.full_name }}:${{ steps.meta.outputs.version }} docker buildx imagetools inspect ${{ github.event.repository.full_name }}:${{ steps.meta.outputs.version }}
- name: Inspect image - name: Inspect image
if: github.event_name == 'release' #if: github.event_name == 'release'
run: | run: |
docker pull ${{ github.event.repository.full_name }}:${{ steps.meta.outputs.version }} docker pull ${{ github.event.repository.full_name }}:${{ steps.meta.outputs.version }}
docker image inspect ${{ github.event.repository.full_name }}:${{ steps.meta.outputs.version }} docker image inspect ${{ github.event.repository.full_name }}:${{ steps.meta.outputs.version }}

View File

@ -47,12 +47,16 @@ RUN \
git \ git \
git-fast-import \ git-fast-import \
jpeg-dev \ jpeg-dev \
libxml2 \
libxslt \
openssh \ openssh \
zlib-dev \ zlib-dev \
&& \ && \
apk add --no-cache --virtual .build \ apk add --no-cache --virtual .build \
gcc \ gcc \
libffi-dev \ libffi-dev \
libxml2-dev \
libxslt-dev \
musl-dev \ musl-dev \
&& \ && \
pip install --no-cache-dir --upgrade pip \ pip install --no-cache-dir --upgrade pip \