From 9b6c0b1d4c96da3d90f8321921d37954cbc1174c Mon Sep 17 00:00:00 2001 From: John Donaldson Date: Thu, 29 Oct 2020 12:45:45 -0400 Subject: [PATCH 1/5] Build multiarch Docker images --- .github/workflows/build+test.yml | 1 + CHANGELOG.md | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/build+test.yml b/.github/workflows/build+test.yml index 77a50b2..b60d1c5 100644 --- a/.github/workflows/build+test.yml +++ b/.github/workflows/build+test.yml @@ -61,6 +61,7 @@ jobs: target: moth file: build/package/Containerfile push: true + platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x tags: | dirtbags/moth:${{ steps.vars.outputs.tag }} ghcr.io/dirtbags/moth:${{ steps.vars.outputs.tag }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 2291c7a..4c508e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [v4.1.0-pre] - Unreleased +### Added +- Build multiarch Docker images ### Changed - Stop building devel server from this codebase; this is moving to a new repo From 56bfe80db00161793d339b3ceb25434ffcf058f6 Mon Sep 17 00:00:00 2001 From: John Donaldson Date: Thu, 29 Oct 2020 14:00:43 -0400 Subject: [PATCH 2/5] Fix build by adding Qemu --- .github/workflows/build+test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build+test.yml b/.github/workflows/build+test.yml index b60d1c5..58f6219 100644 --- a/.github/workflows/build+test.yml +++ b/.github/workflows/build+test.yml @@ -49,6 +49,9 @@ jobs: username: neale password: ${{ secrets.DOCKER_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + # Currently required, because buildx doesn't support auto-push from docker - name: Set up builder uses: docker/setup-buildx-action@v1 From fb3997b585e15863abfc588ea2f5258dcfa64620 Mon Sep 17 00:00:00 2001 From: John Donaldson Date: Thu, 29 Oct 2020 14:20:15 -0400 Subject: [PATCH 3/5] Removing armv6 and s390x builds --- .github/workflows/build+test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build+test.yml b/.github/workflows/build+test.yml index 58f6219..7375352 100644 --- a/.github/workflows/build+test.yml +++ b/.github/workflows/build+test.yml @@ -64,7 +64,7 @@ jobs: target: moth file: build/package/Containerfile push: true - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x + platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le tags: | dirtbags/moth:${{ steps.vars.outputs.tag }} ghcr.io/dirtbags/moth:${{ steps.vars.outputs.tag }} From 85ce79462a6c291111bc6e306acbf2ccf3bbc22b Mon Sep 17 00:00:00 2001 From: John Donaldson Date: Thu, 29 Oct 2020 14:37:19 -0400 Subject: [PATCH 4/5] Adding armv6 back in --- .github/workflows/build+test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build+test.yml b/.github/workflows/build+test.yml index 7375352..2ee2fab 100644 --- a/.github/workflows/build+test.yml +++ b/.github/workflows/build+test.yml @@ -64,7 +64,7 @@ jobs: target: moth file: build/package/Containerfile push: true - platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le + platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le tags: | dirtbags/moth:${{ steps.vars.outputs.tag }} ghcr.io/dirtbags/moth:${{ steps.vars.outputs.tag }} From 842d3ed9f019072105f5ea962ff26676cf6324a5 Mon Sep 17 00:00:00 2001 From: John Donaldson Date: Thu, 29 Oct 2020 15:51:49 -0400 Subject: [PATCH 5/5] Preparing to release v4.0.2 --- CHANGELOG.md | 3 +++ build/package/Containerfile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c508e3..ae1de8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [v4.1.0-pre] - Unreleased + + +## [v4.0.2] - 2020-10-29 ### Added - Build multiarch Docker images ### Changed diff --git a/build/package/Containerfile b/build/package/Containerfile index 7d8ee24..cbde82b 100644 --- a/build/package/Containerfile +++ b/build/package/Containerfile @@ -28,7 +28,7 @@ COPY --from=prodbuild /target / ENTRYPOINT [ "/bin/mothd" ] ########## - +# You should use the dirtbags/moth-devel repo's build for this, instead FROM ubuntu AS moth-devel RUN apt-get -y update && apt-get -y install \ build-essential \