Add manifest build

compose-generator · Oct 22, 2021 · 5e9d812 · 5e9d812
1 parent 0028b68
commit 5e9d812
Show file tree

Hide file tree

Showing 4 changed files with 156 additions and 16 deletions.
diff --git a/.github/workflows/publish-dev.yml b/.github/workflows/publish-dev.yml
@@ -5,32 +5,36 @@ on:
   push:
     branches: [ main, dev ]
 #    paths:
-#      - 'Dockerfile'
+#      - './amd64/Dockerfile'
+#      - './i386/Dockerfile'
+#      - './armv6/Dockerfile'
+#      - './armv7/Dockerfile'
+#      - './arm64/Dockerfile'
 
 jobs:
-  release:
+  build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         arch:
           - {
-              dir: amd64,
+              name: amd64,
               docker-arch: linux/amd64
             }
           - {
-              dir: i386,
+              name: i386,
               docker-arch: linux/i386
             }
           - {
-              dir: armv6,
+              name: armv6,
               docker-arch: linux/arm/v6
             }
           - {
-              dir: armv7,
+              name: armv7,
               docker-arch: linux/arm/v7
             }
           - {
-              dir: arm64,
+              name: arm64,
               docker-arch: linux/arm64/v8
             }
     steps:
@@ -58,5 +62,49 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_SECRET }}
 
       - name: Build Docker image and push to registries
-        working-directory: ./${{ matrix.arch.dir }}
-        run: docker buildx build --push --platform ${{ matrix.arch.docker-arch }} -t ghcr.io/compose-generator/compose-generator-toolbox:dev -t chillibits/compose-generator-toolbox:dev .
+        working-directory: ./${{ matrix.arch.name }}
+        run: |
+          docker buildx build --push --platform ${{ matrix.arch.docker-arch }} \
+            -t ghcr.io/compose-generator/compose-generator-toolbox:${{ matrix.arch.name }}-dev \
+            -t chillibits/compose-generator-toolbox:${{ matrix.arch.name }}-dev .
+
+  manifest:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Docker login GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
+
+      - name: Docker login Docker Hub
+        uses: docker/login-action@v1
+        with:
+          registry: docker.io
+          username: chillibits
+          password: ${{ secrets.DOCKER_HUB_SECRET }}
+
+      - name: Build manifest Docker Hub
+        run: |
+          docker manifest create chillibits/compose-generator-toolbox:dev \
+            chillibits/compose-generator-toolbox:amd64-dev \
+            chillibits/compose-generator-toolbox:i386-dev \
+            chillibits/compose-generator-toolbox:armv6-dev \
+            chillibits/compose-generator-toolbox:armv7-dev \
+            chillibits/compose-generator-toolbox:arm64-dev \
+          docker manifest push chillibits/compose-generator-toolbox:dev
+
+      - name: Build manifest DHCR
+        run: |
+          docker manifest create ghcr.io/chillibits/compose-generator-toolbox:dev \
+            ghcr.io/chillibits/compose-generator-toolbox:amd64-dev \
+            ghcr.io/chillibits/compose-generator-toolbox:i386-dev \
+            ghcr.io/chillibits/compose-generator-toolbox:armv6-dev \
+            ghcr.io/chillibits/compose-generator-toolbox:armv7-dev \
+            ghcr.io/chillibits/compose-generator-toolbox:arm64-dev \
+          docker manifest push ghcr.io/chillibits/compose-generator-toolbox:dev
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,8 +7,31 @@ on:
       - '*'
 
 jobs:
-  release:
+  build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch:
+          - {
+              name: amd64,
+              docker-arch: linux/amd64
+            }
+          - {
+              name: i386,
+              docker-arch: linux/i386
+            }
+          - {
+              name: armv6,
+              docker-arch: linux/arm/v6
+            }
+          - {
+              name: armv7,
+              docker-arch: linux/arm/v7
+            }
+          - {
+              name: arm64,
+              docker-arch: linux/arm64/v8
+            }
     steps:
       - name: Get version name
         id: get_version
@@ -37,5 +60,70 @@ jobs:
           username: chillibits
           password: ${{ secrets.DOCKER_HUB_SECRET }}
 
-      - name: Build Docker image and push to registries # ToDo: ,linux/i386,linux/arm/v5,linux/arm/v6,linux/arm/v7,linux/arm64/v8
-        run: docker buildx build --push --platform linux/amd64 -t ghcr.io/compose-generator/compose-generator-toolbox:latest -t ghcr.io/compose-generator/compose-generator-toolbox:${{ steps.get_version.outputs.version }} -t chillibits/compose-generator-toolbox:latest -t chillibits/compose-generator-toolbox:${{ steps.get_version.outputs.version }} .
+      - name: Build Docker image and push to registries
+        working-directory: ./${{ matrix.arch.name }}
+        run: |
+          docker buildx build --push --platform ${{ matrix.arch.docker-arch }} \
+            -t ghcr.io/compose-generator/compose-generator-toolbox:${{ matrix.arch.name }}-${{ steps.get_version.outputs.version }} \
+            -t chillibits/compose-generator-toolbox:${{ matrix.arch.name }}-${{ steps.get_version.outputs.version }} .
+
+  manifest:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Get version name
+        id: get_version
+        uses: battila7/get-version-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Docker login GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
+
+      - name: Docker login Docker Hub
+        uses: docker/login-action@v1
+        with:
+          registry: docker.io
+          username: chillibits
+          password: ${{ secrets.DOCKER_HUB_SECRET }}
+
+      - name: Build manifest Docker Hub
+        run: |
+          docker manifest create chillibits/compose-generator-toolbox:latest \
+            chillibits/compose-generator-toolbox:amd64-${{ steps.get_version.outputs.version }} \
+            chillibits/compose-generator-toolbox:i386-${{ steps.get_version.outputs.version }} \
+            chillibits/compose-generator-toolbox:armv6-${{ steps.get_version.outputs.version }} \
+            chillibits/compose-generator-toolbox:armv7-${{ steps.get_version.outputs.version }} \
+            chillibits/compose-generator-toolbox:arm64-${{ steps.get_version.outputs.version }} \
+          docker manifest push chillibits/compose-generator-toolbox:latest
+
+          docker manifest create chillibits/compose-generator-toolbox:${{ steps.get_version.outputs.version }} \
+            chillibits/compose-generator-toolbox:amd64-${{ steps.get_version.outputs.version }} \
+            chillibits/compose-generator-toolbox:i386-${{ steps.get_version.outputs.version }} \
+            chillibits/compose-generator-toolbox:armv6-${{ steps.get_version.outputs.version }} \
+            chillibits/compose-generator-toolbox:armv7-${{ steps.get_version.outputs.version }} \
+            chillibits/compose-generator-toolbox:arm64-${{ steps.get_version.outputs.version }} \
+          docker manifest push chillibits/compose-generator-toolbox:${{ steps.get_version.outputs.version }}
+
+      - name: Build manifest DHCR
+        run: |
+          docker manifest create ghcr.io/chillibits/compose-generator-toolbox:latest \
+            ghcr.io/chillibits/compose-generator-toolbox:amd64-${{ steps.get_version.outputs.version }} \
+            ghcr.io/chillibits/compose-generator-toolbox:i386-${{ steps.get_version.outputs.version }} \
+            ghcr.io/chillibits/compose-generator-toolbox:armv6-${{ steps.get_version.outputs.version }} \
+            ghcr.io/chillibits/compose-generator-toolbox:armv7-${{ steps.get_version.outputs.version }} \
+            ghcr.io/chillibits/compose-generator-toolbox:arm64-${{ steps.get_version.outputs.version }} \
+          docker manifest push ghcr.io/chillibits/compose-generator-toolbox:latest
+
+          docker manifest create ghcr.io/chillibits/compose-generator-toolbox:${{ steps.get_version.outputs.version }} \
+            ghcr.io/chillibits/compose-generator-toolbox:amd64-${{ steps.get_version.outputs.version }} \
+            ghcr.io/chillibits/compose-generator-toolbox:i386-${{ steps.get_version.outputs.version }} \
+            ghcr.io/chillibits/compose-generator-toolbox:armv6-${{ steps.get_version.outputs.version }} \
+            ghcr.io/chillibits/compose-generator-toolbox:armv7-${{ steps.get_version.outputs.version }} \
+            ghcr.io/chillibits/compose-generator-toolbox:arm64-${{ steps.get_version.outputs.version }} \
+          docker manifest push ghcr.io/chillibits/compose-generator-toolbox:${{ steps.get_version.outputs.version }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -3,8 +3,12 @@ name: Dockerfile Validation
 
 on:
   push:
-    paths:
-      - 'Dockerfile'
+#    paths:
+#      - './amd64/Dockerfile'
+#      - './i386/Dockerfile'
+#      - './armv6/Dockerfile'
+#      - './armv7/Dockerfile'
+#      - './arm64/Dockerfile'
 
 jobs:
   build:

diff --git a/README.md b/README.md
@@ -26,9 +26,9 @@ Please note, that this Docker image is based on Linux Alpine and only supports a
 - create-react-app
 - curl
 - django-admin
-- dotnet
+- dotnet (not for armv6, armv7, arm64)
 - git
-- go
+- go (not for i386)
 - make
 - ng
 - npm