Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

docker - drop support for prebuilt arm images

Browse Source
This commit is contained in:
florian 2022-06-06 23:35:37 +02:00
parent 5258d8e58f
commit 972a284efd
3 changed files with 102 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
.github/workflows/dev.yml vendored
View File

@ -112,25 +112,25 @@ jobs:
cache-to: type=registry,ref=bunkerity/cache:bw-ui-386-cache,mode=min cache-to: type=registry,ref=bunkerity/cache:bw-ui-386-cache,mode=min
# Build bunkerweb/arm # Build bunkerweb/arm
build-bw-arm: # build-bw-arm:
runs-on: [self-hosted, ARM64] # runs-on: [self-hosted, ARM64]
steps: # steps:
# Prepare # Prepare
- name: Checkout source code # - name: Checkout source code
uses: actions/checkout@v3 # uses: actions/checkout@v3
- name: Setup Buildx # - name: Setup Buildx
uses: docker/setup-buildx-action@v2 # uses: docker/setup-buildx-action@v2
- name: Login to Docker Hub # - name: Login to Docker Hub
uses: docker/login-action@v2 # uses: docker/login-action@v2
with: # with:
username: ${{ secrets.DOCKER_USERNAME }} # username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }} # password: ${{ secrets.DOCKER_TOKEN }}
- name: Login to private repository # - name: Login to private repository
uses: docker/login-action@v2 # uses: docker/login-action@v2
with: # with:
registry: ${{ secrets.PRIVATE_REGISTRY }} # registry: ${{ secrets.PRIVATE_REGISTRY }}
username: registry # username: registry
password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} # password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
# Build images # Build images
# - name: Build BW for armv7 # - name: Build BW for armv7
@ -142,15 +142,15 @@ jobs:
# tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv7:latest # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv7:latest
# cache-from: type=registry,ref=bunkerity/cache:bw-armv7-cache # cache-from: type=registry,ref=bunkerity/cache:bw-armv7-cache
# cache-to: type=registry,ref=bunkerity/cache:bw-armv7-cache,mode=min # cache-to: type=registry,ref=bunkerity/cache:bw-armv7-cache,mode=min
- name: Build BW for armv8 # - name: Build BW for armv8
uses: docker/build-push-action@v3 # uses: docker/build-push-action@v3
with: # with:
context: . # context: .
platforms: linux/arm64/v8 # platforms: linux/arm64/v8
push: true # push: true
tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv8:latest # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv8:latest
cache-from: type=registry,ref=bunkerity/cache:bw-armv8-cache # cache-from: type=registry,ref=bunkerity/cache:bw-armv8-cache
cache-to: type=registry,ref=bunkerity/cache:bw-armv8-cache,mode=min # cache-to: type=registry,ref=bunkerity/cache:bw-armv8-cache,mode=min
# - name: Build BW autoconf for armv7 # - name: Build BW autoconf for armv7
# uses: docker/build-push-action@v3 # uses: docker/build-push-action@v3
# with: # with:
@ -161,16 +161,16 @@ jobs:
# tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv7:latest # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv7:latest
# cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-armv7-cache # cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-armv7-cache
# cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv7-cache,mode=min # cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv7-cache,mode=min
- name: Build BW autoconf for armv8 # - name: Build BW autoconf for armv8
uses: docker/build-push-action@v3 # uses: docker/build-push-action@v3
with: # with:
context: . # context: .
file: autoconf/Dockerfile # file: autoconf/Dockerfile
platforms: linux/arm64/v8 # platforms: linux/arm64/v8
push: true # push: true
tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv8:latest # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv8:latest
cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache # cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache
cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache,mode=min # cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache,mode=min
# - name: Build BW UI for armv7 # - name: Build BW UI for armv7
# uses: docker/build-push-action@v3 # uses: docker/build-push-action@v3
# with: # with:
@ -181,16 +181,17 @@ jobs:
# tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv7:latest # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv7:latest
# cache-from: type=registry,ref=bunkerity/cache:bw-ui-armv7-cache # cache-from: type=registry,ref=bunkerity/cache:bw-ui-armv7-cache
# cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv7-cache,mode=min # cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv7-cache,mode=min
- name: Build BW UI for armv8 # - name: Build BW UI for armv8
uses: docker/build-push-action@v3 # uses: docker/build-push-action@v3
with: # with:
context: . # context: .
file: ui/Dockerfile # file: ui/Dockerfile
platforms: linux/arm64/v8 # platforms: linux/arm64/v8
push: true # push: true
tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv8:latest # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv8:latest
cache-from: type=registry,ref=bunkerity/cache:bw-ui-armv8-cache # cache-from: type=registry,ref=bunkerity/cache:bw-ui-armv8-cache
cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv8-cache,mode=min # cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv8-cache,mode=min
# Run tests # Run tests
tests: tests:
@ -272,7 +273,8 @@ jobs:
# Push to dev registries # Push to dev registries
push-docker: 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 runs-on: ubuntu-latest
steps: steps:
@ -300,37 +302,34 @@ jobs:
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
context: . context: .
platforms: linux/amd64,linux/386,linux/arm64/v8 platforms: linux/amd64,linux/386
push: true push: true
tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb:staging,bunkerity/bunkerweb:dev tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb:staging,bunkerity/bunkerweb:dev
cache-from: | cache-from: |
type=registry,ref=bunkerity/cache:bw-amd64-cache type=registry,ref=bunkerity/cache:bw-amd64-cache
type=registry,ref=bunkerity/cache:bw-386-cache type=registry,ref=bunkerity/cache:bw-386-cache
type=registry,ref=bunkerity/cache:bw-armv8-cache
- name: Build and push BW autoconf - name: Build and push BW autoconf
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
context: . context: .
file: autoconf/Dockerfile file: autoconf/Dockerfile
platforms: linux/amd64,linux/386,linux/arm64/v8 platforms: linux/amd64,linux/386
push: true push: true
tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf:staging,bunkerity/bunkerweb-autoconf:dev tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf:staging,bunkerity/bunkerweb-autoconf:dev
cache-from: | cache-from: |
type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache 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-386-cache
type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache
- name: Build and push BW UI - name: Build and push BW UI
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
context: . context: .
file: ui/Dockerfile file: ui/Dockerfile
platforms: linux/amd64,linux/386,linux/arm64/v8 platforms: linux/amd64,linux/386
push: true push: true
tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui:staging,bunkerity/bunkerweb-ui:dev tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui:staging,bunkerity/bunkerweb-ui:dev
cache-from: | cache-from: |
type=registry,ref=bunkerity/cache:bw-ui-amd64-cache 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-386-cache
type=registry,ref=bunkerity/cache:bw-ui-armv8-cache
# Push to PackageCloud # Push to PackageCloud
push-linux: push-linux:

99
.github/workflows/prod.yml vendored
View File

@ -106,25 +106,25 @@ jobs:
cache-to: type=registry,ref=bunkerity/cache:bw-ui-386-cache,mode=min cache-to: type=registry,ref=bunkerity/cache:bw-ui-386-cache,mode=min
# Build bunkerweb/arm # Build bunkerweb/arm
build-bw-arm: # build-bw-arm:
runs-on: [self-hosted, ARM64] # runs-on: [self-hosted, ARM64]
steps: # steps:
# Prepare # Prepare
- name: Checkout source code # - name: Checkout source code
uses: actions/checkout@v3 # uses: actions/checkout@v3
- name: Setup Buildx # - name: Setup Buildx
uses: docker/setup-buildx-action@v2 # uses: docker/setup-buildx-action@v2
- name: Login to Docker Hub # - name: Login to Docker Hub
uses: docker/login-action@v2 # uses: docker/login-action@v2
with: # with:
username: ${{ secrets.DOCKER_USERNAME }} # username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }} # password: ${{ secrets.DOCKER_TOKEN }}
- name: Login to private repository # - name: Login to private repository
uses: docker/login-action@v2 # uses: docker/login-action@v2
with: # with:
registry: ${{ secrets.PRIVATE_REGISTRY }} # registry: ${{ secrets.PRIVATE_REGISTRY }}
username: registry # username: registry
password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} # password: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
# Build images # Build images
# - name: Build BW for armv7 # - name: Build BW for armv7
@ -136,14 +136,14 @@ jobs:
# tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv7:latest # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv7:latest
# cache-from: type=registry,ref=bunkerity/cache:bw-armv7-cache # cache-from: type=registry,ref=bunkerity/cache:bw-armv7-cache
# cache-to: type=registry,ref=bunkerity/cache:bw-armv7-cache,mode=min # cache-to: type=registry,ref=bunkerity/cache:bw-armv7-cache,mode=min
- name: Build BW for armv8 # - name: Build BW for armv8
uses: docker/build-push-action@v3 # uses: docker/build-push-action@v3
with: # with:
context: . # context: .
platforms: linux/arm64/v8 # platforms: linux/arm64/v8
push: true # push: true
tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv8:latest # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-tests-armv8:latest
cache-to: type=registry,ref=bunkerity/cache:bw-armv8-cache,mode=min # cache-to: type=registry,ref=bunkerity/cache:bw-armv8-cache,mode=min
# - name: Build BW autoconf for armv7 # - name: Build BW autoconf for armv7
# uses: docker/build-push-action@v3 # uses: docker/build-push-action@v3
# with: # with:
@ -154,15 +154,15 @@ jobs:
# tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv7:latest # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv7:latest
# cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-armv7-cache # cache-from: type=registry,ref=bunkerity/cache:bw-autoconf-armv7-cache
# cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv7-cache,mode=min # cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv7-cache,mode=min
- name: Build BW autoconf for armv8 # - name: Build BW autoconf for armv8
uses: docker/build-push-action@v3 # uses: docker/build-push-action@v3
with: # with:
context: . # context: .
file: autoconf/Dockerfile # file: autoconf/Dockerfile
platforms: linux/arm64/v8 # platforms: linux/arm64/v8
push: true # push: true
tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv8:latest # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-armv8:latest
cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache,mode=min # cache-to: type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache,mode=min
# - name: Build BW UI for armv7 # - name: Build BW UI for armv7
# uses: docker/build-push-action@v3 # uses: docker/build-push-action@v3
# with: # with:
@ -173,15 +173,15 @@ jobs:
# tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv7:latest # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv7:latest
# cache-from: type=registry,ref=bunkerity/cache:bw-ui-armv7-cache # cache-from: type=registry,ref=bunkerity/cache:bw-ui-armv7-cache
# cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv7-cache,mode=min # cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv7-cache,mode=min
- name: Build BW UI for armv8 # - name: Build BW UI for armv8
uses: docker/build-push-action@v3 # uses: docker/build-push-action@v3
with: # with:
context: . # context: .
file: ui/Dockerfile # file: ui/Dockerfile
platforms: linux/arm64/v8 # platforms: linux/arm64/v8
push: true # push: true
tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv8:latest # tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-armv8:latest
cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv8-cache,mode=min # cache-to: type=registry,ref=bunkerity/cache:bw-ui-armv8-cache,mode=min
# Run tests # Run tests
tests: tests:
@ -263,7 +263,7 @@ jobs:
# Push to dev registries # Push to dev registries
push-docker: push-docker:
needs: [tests, build-bw-386, build-bw-arm] needs: [tests, build-bw-386]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@ -295,37 +295,34 @@ jobs:
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
context: . context: .
platforms: linux/amd64,linux/386,linux/arm64/v8 platforms: linux/amd64,linux/386
push: true push: true
tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb:latest,bunkerity/bunkerweb:latest,bunkerity/bunkerweb:${{ env.VERSION }} tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb:latest,bunkerity/bunkerweb:latest,bunkerity/bunkerweb:${{ env.VERSION }}
cache-from: | cache-from: |
type=registry,ref=bunkerity/cache:bw-amd64-cache type=registry,ref=bunkerity/cache:bw-amd64-cache
type=registry,ref=bunkerity/cache:bw-386-cache type=registry,ref=bunkerity/cache:bw-386-cache
type=registry,ref=bunkerity/cache:bw-armv8-cache
- name: Build and push BW autoconf - name: Build and push BW autoconf
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
context: . context: .
file: autoconf/Dockerfile file: autoconf/Dockerfile
platforms: linux/amd64,linux/386,linux/arm64/v8 platforms: linux/amd64,linux/386
push: true push: true
tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:${{ env.VERSION }} tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:${{ env.VERSION }}
cache-from: | cache-from: |
type=registry,ref=bunkerity/cache:bw-autoconf-amd64-cache 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-386-cache
type=registry,ref=bunkerity/cache:bw-autoconf-armv8-cache
- name: Build and push BW UI - name: Build and push BW UI
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
context: . context: .
file: ui/Dockerfile file: ui/Dockerfile
platforms: linux/amd64,linux/386,linux/arm64/v8 platforms: linux/amd64,linux/386
push: true push: true
tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:${{ env.VERSION }} tags: ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:${{ env.VERSION }}
cache-from: | cache-from: |
type=registry,ref=bunkerity/cache:bw-ui-amd64-cache 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-386-cache
type=registry,ref=bunkerity/cache:bw-ui-armv8-cache
# Push to PackageCloud # Push to PackageCloud
push-linux: push-linux:

2
docs/integrations.md
View File

@ -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. 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 ```shell
docker pull bunkerity/bunkerweb:1.4.0 docker pull bunkerity/bunkerweb:1.4.0