Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix]: Docker build #5

Merged
merged 3 commits into from
Nov 30, 2023
Merged

[Fix]: Docker build #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a35df6
drop armv7 build
BWibo Nov 29, 2023
bd69820
distribute platforms across runners
BWibo Nov 29, 2023
7c8e389
distribute platform across runners
BWibo Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/docker-build-push-edge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@ on:
- main
env:
IMAGE_NAME: citydb-tool
PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7

jobs:
build-push:

runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
platform:
- linux/amd64
- linux/arm64
steps:
-
name: Parse short sha
Expand Down Expand Up @@ -46,7 +49,7 @@ jobs:
name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: ${{ env.PLATFORMS }}
platforms: ${{ matrix.platform }}
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down Expand Up @@ -81,7 +84,7 @@ jobs:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
platforms: ${{ env.PLATFORMS }}
platforms: ${{ matrix.platform }}
build-args: |
CITYDB_TOOL_VERSION=${{ steps.short-sha.outputs.sha }}
-
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/docker-build-push-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ on:
types: [published, edited]
env:
IMAGE_NAME: citydb-tool
PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7

jobs:
build-push:

runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
platform:
- linux/amd64
- linux/arm64
steps:
-
name: Get release version without v
Expand Down Expand Up @@ -45,7 +48,7 @@ jobs:
name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: ${{ env.PLATFORMS }}
platforms: ${{ matrix.platform }}
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down Expand Up @@ -80,7 +83,7 @@ jobs:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
platforms: ${{ env.PLATFORMS }}
platforms: ${{ matrix.platform }}
build-args: |
CITYDB_TOOL_VERSION=${{ steps.release_version.outputs.version }}
-
Expand Down