From 972a284efd9032a5a4da8c459fb526bfe6601a50 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 6 Jun 2022 23:35:37 +0200 Subject: [PATCH] docker - drop support for prebuilt arm images --- .github/workflows/dev.yml | 107 ++++++++++++++++++------------------- .github/workflows/prod.yml | 99 +++++++++++++++++----------------- docs/integrations.md | 2 +- 3 files changed, 102 insertions(+), 106 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index aab38b10..f3c5862e 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -112,25 +112,25 @@ jobs: cache-to: type=registry,ref=bunkerity/cache:bw-ui-386-cache,mode=min # Build bunkerweb/arm - build-bw-arm: - runs-on: [self-hosted, ARM64] - steps: + # build-bw-arm: + # runs-on: [self-hosted, ARM64] + # steps: # Prepare - - name: Checkout source code - uses: actions/checkout@v3 - - name: Setup Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - - name: Login to private repository - uses: docker/login-action@v2 - with: - registry: ${{ secrets.PRIVATE_REGISTRY }} - username: registry - password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} + # - name: Checkout source code + # uses: actions/checkout@v3 + # - name: Setup Buildx + # uses: docker/setup-buildx-action@v2 + # - name: Login to Docker Hub + # uses: docker/login-action@v2 + # with: + # username: ${{ secrets.DOCKER_USERNAME }} + # password: ${{ secrets.DOCKER_TOKEN }} + # - name: Login to private repository + # uses: docker/login-action@v2 + # with: + # registry: ${{ secrets.PRIVATE_REGISTRY }} + # username: registry + # password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} # Build images # - name: Build BW for armv7 @@ -142,15 +142,15 @@ jobs: # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv7:latest # cache-from: type=registry,ref=bunkerity/cache:bw-armv7-cache # cache-to: type=registry,ref=bunkerity/cache:bw-armv7-cache,mode=min - - name: Build BW for armv8 - uses: docker/build-push-action@v3 - with: - context: . - platforms: linux/arm64/v8 - push: true - tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv8:latest - cache-from: type=registry,ref=bunkerity/cache:bw-armv8-cache - cache-to: type=registry,ref=bunkerity/cache:bw-armv8-cache,mode=min + # - name: Build BW for armv8 + # uses: docker/build-push-action@v3 + # with: + # context: . + # platforms: linux/arm64/v8 + # push: true + # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv8:latest + # cache-from: type=registry,ref=bunkerity/cache:bw-armv8-cache + # cache-to: type=registry,ref=bunkerity/cache:bw-armv8-cache,mode=min # - name: Build BW autoconf for armv7 # uses: docker/build-push-action@v3 # with: @@ -161,16 +161,16 @@ jobs: # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv7:latest # cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-armv7-cache # cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv7-cache,mode=min - - name: Build BW autoconf for armv8 - uses: docker/build-push-action@v3 - with: - context: . - file: autoconf/Dockerfile - platforms: linux/arm64/v8 - push: true - tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv8:latest - cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache - cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache,mode=min + # - name: Build BW autoconf for armv8 + # uses: docker/build-push-action@v3 + # with: + # context: . + # file: autoconf/Dockerfile + # platforms: linux/arm64/v8 + # push: true + # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv8:latest + # cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache + # cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache,mode=min # - name: Build BW UI for armv7 # uses: docker/build-push-action@v3 # with: @@ -181,16 +181,17 @@ jobs: # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv7:latest # cache-from: type=registry,ref=bunkerity/cache:bw-ui-armv7-cache # cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv7-cache,mode=min - - name: Build BW UI for armv8 - uses: docker/build-push-action@v3 - with: - context: . - file: ui/Dockerfile - platforms: linux/arm64/v8 - push: true - tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv8:latest - cache-from: type=registry,ref=bunkerity/cache:bw-ui-armv8-cache - cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv8-cache,mode=min + # - name: Build BW UI for armv8 + # uses: docker/build-push-action@v3 + # with: + # context: . + # file: ui/Dockerfile + # platforms: linux/arm64/v8 + # push: true + # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv8:latest + # cache-from: type=registry,ref=bunkerity/cache:bw-ui-armv8-cache + # cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv8-cache,mode=min + # Run tests tests: @@ -272,7 +273,8 @@ jobs: # Push to dev registries push-docker: - needs: [tests, build-bw-386, build-bw-arm] + # needs: [tests, build-bw-386, build-bw-arm] + needs: [tests, build-bw-386] runs-on: ubuntu-latest steps: @@ -300,37 +302,34 @@ jobs: uses: docker/build-push-action@v3 with: context: . - platforms: linux/amd64,linux/386,linux/arm64/v8 + platforms: linux/amd64,linux/386 push: true tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb:staging,bunkerity/bunkerweb:dev cache-from: | type=registry,ref=bunkerity/cache:bw-amd64-cache type=registry,ref=bunkerity/cache:bw-386-cache - type=registry,ref=bunkerity/cache:bw-armv8-cache - name: Build and push BW autoconf uses: docker/build-push-action@v3 with: context: . file: autoconf/Dockerfile - platforms: linux/amd64,linux/386,linux/arm64/v8 + platforms: linux/amd64,linux/386 push: true tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf:staging,bunkerity/bunkerweb-autoconf:dev cache-from: | type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache type=registry,ref=bunkerity/cache:bw-autoconf-386-cache - type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache - name: Build and push BW UI uses: docker/build-push-action@v3 with: context: . file: ui/Dockerfile - platforms: linux/amd64,linux/386,linux/arm64/v8 + platforms: linux/amd64,linux/386 push: true tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui:staging,bunkerity/bunkerweb-ui:dev cache-from: | type=registry,ref=bunkerity/cache:bw-ui-amd64-cache type=registry,ref=bunkerity/cache:bw-ui-386-cache - type=registry,ref=bunkerity/cache:bw-ui-armv8-cache # Push to PackageCloud push-linux: diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index 8945f2c7..55b73e9e 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -106,25 +106,25 @@ jobs: cache-to: type=registry,ref=bunkerity/cache:bw-ui-386-cache,mode=min # Build bunkerweb/arm - build-bw-arm: - runs-on: [self-hosted, ARM64] - steps: + # build-bw-arm: + # runs-on: [self-hosted, ARM64] + # steps: # Prepare - - name: Checkout source code - uses: actions/checkout@v3 - - name: Setup Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - - name: Login to private repository - uses: docker/login-action@v2 - with: - registry: ${{ secrets.PRIVATE_REGISTRY }} - username: registry - password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} + # - name: Checkout source code + # uses: actions/checkout@v3 + # - name: Setup Buildx + # uses: docker/setup-buildx-action@v2 + # - name: Login to Docker Hub + # uses: docker/login-action@v2 + # with: + # username: ${{ secrets.DOCKER_USERNAME }} + # password: ${{ secrets.DOCKER_TOKEN }} + # - name: Login to private repository + # uses: docker/login-action@v2 + # with: + # registry: ${{ secrets.PRIVATE_REGISTRY }} + # username: registry + # password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} # Build images # - name: Build BW for armv7 @@ -136,14 +136,14 @@ jobs: # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv7:latest # cache-from: type=registry,ref=bunkerity/cache:bw-armv7-cache # cache-to: type=registry,ref=bunkerity/cache:bw-armv7-cache,mode=min - - name: Build BW for armv8 - uses: docker/build-push-action@v3 - with: - context: . - platforms: linux/arm64/v8 - push: true - tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv8:latest - cache-to: type=registry,ref=bunkerity/cache:bw-armv8-cache,mode=min + # - name: Build BW for armv8 + # uses: docker/build-push-action@v3 + # with: + # context: . + # platforms: linux/arm64/v8 + # push: true + # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv8:latest + # cache-to: type=registry,ref=bunkerity/cache:bw-armv8-cache,mode=min # - name: Build BW autoconf for armv7 # uses: docker/build-push-action@v3 # with: @@ -154,15 +154,15 @@ jobs: # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv7:latest # cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-armv7-cache # cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv7-cache,mode=min - - name: Build BW autoconf for armv8 - uses: docker/build-push-action@v3 - with: - context: . - file: autoconf/Dockerfile - platforms: linux/arm64/v8 - push: true - tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv8:latest - cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache,mode=min + # - name: Build BW autoconf for armv8 + # uses: docker/build-push-action@v3 + # with: + # context: . + # file: autoconf/Dockerfile + # platforms: linux/arm64/v8 + # push: true + # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv8:latest + # cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache,mode=min # - name: Build BW UI for armv7 # uses: docker/build-push-action@v3 # with: @@ -173,15 +173,15 @@ jobs: # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv7:latest # cache-from: type=registry,ref=bunkerity/cache:bw-ui-armv7-cache # cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv7-cache,mode=min - - name: Build BW UI for armv8 - uses: docker/build-push-action@v3 - with: - context: . - file: ui/Dockerfile - platforms: linux/arm64/v8 - push: true - tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv8:latest - cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv8-cache,mode=min + # - name: Build BW UI for armv8 + # uses: docker/build-push-action@v3 + # with: + # context: . + # file: ui/Dockerfile + # platforms: linux/arm64/v8 + # push: true + # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv8:latest + # cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv8-cache,mode=min # Run tests tests: @@ -263,7 +263,7 @@ jobs: # Push to dev registries push-docker: - needs: [tests, build-bw-386, build-bw-arm] + needs: [tests, build-bw-386] runs-on: ubuntu-latest steps: @@ -295,37 +295,34 @@ jobs: uses: docker/build-push-action@v3 with: context: . - platforms: linux/amd64,linux/386,linux/arm64/v8 + platforms: linux/amd64,linux/386 push: true tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb:latest,bunkerity/bunkerweb:latest,bunkerity/bunkerweb:${{ env.VERSION }} cache-from: | type=registry,ref=bunkerity/cache:bw-amd64-cache type=registry,ref=bunkerity/cache:bw-386-cache - type=registry,ref=bunkerity/cache:bw-armv8-cache - name: Build and push BW autoconf uses: docker/build-push-action@v3 with: context: . file: autoconf/Dockerfile - platforms: linux/amd64,linux/386,linux/arm64/v8 + platforms: linux/amd64,linux/386 push: true tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:${{ env.VERSION }} cache-from: | type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache type=registry,ref=bunkerity/cache:bw-autoconf-386-cache - type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache - name: Build and push BW UI uses: docker/build-push-action@v3 with: context: . file: ui/Dockerfile - platforms: linux/amd64,linux/386,linux/arm64/v8 + platforms: linux/amd64,linux/386 push: true tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:${{ env.VERSION }} cache-from: | type=registry,ref=bunkerity/cache:bw-ui-amd64-cache type=registry,ref=bunkerity/cache:bw-ui-386-cache - type=registry,ref=bunkerity/cache:bw-ui-armv8-cache # Push to PackageCloud push-linux: diff --git a/docs/integrations.md b/docs/integrations.md index 144c69ae..ef27b988 100644 --- a/docs/integrations.md +++ b/docs/integrations.md @@ -9,7 +9,7 @@ Using BunkerWeb as a [Docker](https://www.docker.com/) container is a quick and easy way to test and use it as long as you are familiar with the Docker technology. -We provide ready to use prebuilt images for x64, x86, armv7 and arm64 platforms on [Docker Hub](https://hub.docker.com/r/bunkerity/bunkerweb) : +We provide ready to use prebuilt images for x64 and x86 architectures (armv7 and armv8 are not supported at the moment) on [Docker Hub](https://hub.docker.com/r/bunkerity/bunkerweb) : ```shell docker pull bunkerity/bunkerweb:1.4.0