diff --git a/.github/workflows/build_latest.yml b/.github/workflows/build_latest.yml index c31fdbb..67f1370 100644 --- a/.github/workflows/build_latest.yml +++ b/.github/workflows/build_latest.yml @@ -21,7 +21,7 @@ jobs: timeout-minutes: 90 steps: - name: Run Docker on tmpfs - uses: JonasAlfredsson/docker-on-tmpfs@main + uses: JonasAlfredsson/docker-on-tmpfs@v1.0.0 with: tmpfs_size: 4 @@ -43,7 +43,6 @@ jobs: linux/arm64 linux/arm/v7 push: ${{ github.event_name != 'pull_request' }} - build-args: BUILDX_QEMU_ENV=false tags: jonasal/nginx-certbot:latest - name: Print usage info @@ -55,9 +54,10 @@ jobs: docker_buildx_alpine: runs-on: ubuntu-latest + timeout-minutes: 180 steps: - name: Run Docker on tmpfs - uses: JonasAlfredsson/docker-on-tmpfs@main + uses: JonasAlfredsson/docker-on-tmpfs@v1.0.0 with: tmpfs_size: 4 diff --git a/.github/workflows/build_tags.yml b/.github/workflows/build_tags.yml index 324ad28..0bc1c40 100644 --- a/.github/workflows/build_tags.yml +++ b/.github/workflows/build_tags.yml @@ -10,8 +10,13 @@ on: jobs: docker_buildx_debian: runs-on: ubuntu-latest - timeout-minutes: 60 + timeout-minutes: 90 steps: + - name: Run Docker on tmpfs + uses: JonasAlfredsson/docker-on-tmpfs@v1.0.0 + with: + tmpfs_size: 4 + - name: Perform setup steps uses: JonasAlfredsson/checkout-qemu-buildx@v1.0.0 with: @@ -36,7 +41,6 @@ jobs: pull: true no-cache: true push: true - build-args: BUILDX_QEMU_ENV=true tags: | jonasal/nginx-certbot:${{ steps.tagger.outputs.APP_MAJOR }} jonasal/nginx-certbot:${{ steps.tagger.outputs.APP_MAJOR }}.${{ steps.tagger.outputs.APP_MINOR }} @@ -45,8 +49,13 @@ jobs: docker_buildx_alpine: runs-on: ubuntu-latest - timeout-minutes: 60 + timeout-minutes: 180 steps: + - name: Run Docker on tmpfs + uses: JonasAlfredsson/docker-on-tmpfs@v1.0.0 + with: + tmpfs_size: 4 + - name: Perform setup steps uses: JonasAlfredsson/checkout-qemu-buildx@v1.0.0 with: @@ -66,6 +75,7 @@ jobs: platforms: | linux/amd64 linux/arm64 + linux/arm/v7 pull: true no-cache: true push: true diff --git a/src/Dockerfile b/src/Dockerfile index 6ceee9f..6dc2499 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -37,11 +37,6 @@ RUN set -ex && \ && \ # Install the latest version of PIP, Setuptools and Wheel. curl -L 'https://bootstrap.pypa.io/get-pip.py' | python3 && \ -# Handle an extremely specific issue when building the cryptography package for -# 32-bit architectures within QEMU running on a 64-bit host (issue #30). - if [ "${BUILDX_QEMU_ENV}" = "true" ] && [ "$(getconf LONG_BIT)" = "32" ]; then \ - pip3 install -U cryptography==3.3.2; \ - fi && \ # Install certbot. pip3 install -U cffi certbot \ # And the supported extra authenticators