build both DLP and official 2.3.3 in a single workflow

and fix a unknown architecture and OS bug, see docker/build-push-action#820 https://z.itpub.net/article/detail/0CDEB0CB6B793FD6B38611B9E15B6FA6
minnyres · Mar 25, 2023 · 9534bff · 9534bff
1 parent cf671de
commit 9534bff
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 39 deletions.
diff --git a/.github/workflows/docker-image-official.yml b/.github/workflows/docker-image-official.yml
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -8,6 +8,7 @@ jobs:
     strategy:
       matrix:
         platform: [linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64/v8, linux/ppc64le, linux/s390x, linux/riscv64]
+        amule_version: [dlp, official-2.3.3]
 
     runs-on: ubuntu-latest
 
@@ -39,7 +40,9 @@ jobs:
       uses: docker/build-push-action@v2
       with:
           context: ./
-          file: ./Dockerfile
+          file: ./${{ matrix.amule_version }}/Dockerfile
           push: true
           platforms: ${{ matrix.platform }}
-          tags: minnyres/amule-dlp:${{ steps.setValues.outputs.CPU_ARCH }}
+          tags: minnyres/amule-dlp:${{ matrix.amule_version }}-${{ steps.setValues.outputs.CPU_ARCH }}
+          provenance: false
+          sbom: false
diff --git a/Dockerfile → dlp/Dockerfile b/Dockerfile → dlp/Dockerfile
diff --git a/official-2.3.3/Dockerfile b/official-2.3.3/Dockerfile
@@ -5,7 +5,7 @@ RUN buildDeps='g++ git bash patch file libtool automake make flex bison wget xz
     && apk add --no-cache $buildDeps \
     && mkdir -p /amule-build /app/lib
 
-COPY cryptopp.sh wxbase.sh upnp.sh autoconf.sh amule-fix-exception.patch /amule-build/
+COPY cryptopp.sh wxbase.sh upnp.sh autoconf.sh amule-fix-exception.patch config.sub config.guess /amule-build/
 
 # Build dependencies
 RUN cd /amule-build \