From 0dcb2c9ff54ef0efbdb2d9029d6038ae9458b7d4 Mon Sep 17 00:00:00 2001 From: squidfunk Date: Mon, 21 Aug 2023 21:52:26 +0200 Subject: [PATCH] Fixed Docker image build --- .github/workflows/build.yml | 11 ++++++----- Dockerfile | 4 ++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62d2c4c3e..0c3b8fff2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,6 +23,7 @@ on: push: branches: - master + - fix/docker-build pull_request: release: types: @@ -106,14 +107,14 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - if: github.event_name == 'release' + #if: github.event_name == 'release' uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Login to GitHub Container Registry - if: github.event_name == 'release' + #if: github.event_name == 'release' uses: docker/login-action@v2 with: registry: ghcr.io @@ -153,7 +154,7 @@ jobs: docker run --rm -i -v ${PWD}:/docs ${REPO_FULL_NAME,,}:${{ steps.meta.outputs.version }} build - name: Set platforms - if: github.event_name == 'release' + #if: github.event_name == 'release' run: | echo "PLATFORMS=linux/amd64,linux/arm64,linux/arm/v7" >> $GITHUB_ENV @@ -167,12 +168,12 @@ jobs: labels: ${{ steps.meta.outputs.labels }} - name: Check manifest - if: github.event_name == 'release' + #if: github.event_name == 'release' run: | docker buildx imagetools inspect ${{ github.event.repository.full_name }}:${{ steps.meta.outputs.version }} - name: Inspect image - if: github.event_name == 'release' + #if: github.event_name == 'release' run: | docker pull ${{ github.event.repository.full_name }}:${{ steps.meta.outputs.version }} docker image inspect ${{ github.event.repository.full_name }}:${{ steps.meta.outputs.version }} diff --git a/Dockerfile b/Dockerfile index 5595e842a..0c15409b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,12 +47,16 @@ RUN \ git \ git-fast-import \ jpeg-dev \ + libxml2 \ + libxslt \ openssh \ zlib-dev \ && \ apk add --no-cache --virtual .build \ gcc \ libffi-dev \ + libxml2-dev \ + libxslt-dev \ musl-dev \ && \ pip install --no-cache-dir --upgrade pip \