Test Build

Author: dbpolito

.github/workflows/ci-cd.yml

@@ -19,10 +19,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.2.1
+        uses: docker/setup-buildx-action@v2
 
       - name: Cache Docker layers
-        uses: actions/cache@v3.0.11
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: docker-buildx-${{ matrix.version }}-${{ github.sha }}
@@ -34,21 +34,21 @@ jobs:
             --cache-from type=local,src=/tmp/.buildx-cache/${{ matrix.version }} \
             --cache-to type=local,dest=/tmp/.buildx-cache/${{ matrix.version }} \
             --output type=docker \
-            --tag kooldev/node:${{ matrix.version }} \
+            --tag kooldev/node:${{ matrix.version }}-${arch} \
             ${{ matrix.version }}
 
       - name: Tests
         run: |
-          docker run kooldev/node:${{ matrix.version }} node -v;
-          docker run kooldev/node:${{ matrix.version }} npm -v;
-          docker run kooldev/node:${{ matrix.version }} yarn -v;
+          docker run kooldev/node:${{ matrix.version }}-${arch} node -v;
+          docker run kooldev/node:${{ matrix.version }}-${arch} npm -v;
+          docker run kooldev/node:${{ matrix.version }}-${arch} yarn -v;
 
-          docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }} node -v;
-          docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }} npm -v;
-          docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }} yarn -v;
+          docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }}-${arch} node -v;
+          docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }}-${arch} npm -v;
+          docker run -e ASUSER=1000 kooldev/node:${{ matrix.version }}-${arch} yarn -v;
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2
         if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node'
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -57,4 +57,24 @@ jobs:
       - name: Push to DockerHub
         if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node'
         run: |
-          docker push kooldev/node:${{ matrix.version }}
+          docker push kooldev/node:${{ matrix.version }}-${arch}
+
+  amend:
+    if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-node'
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version: [16, 18]
+
+    steps:
+      - uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - run: |
+          docker manifest create kooldev/node:${{ matrix.version }} \
+            --amend kooldev/node:${{ matrix.version }}-amd64 \
+            --amend kooldev/node:${{ matrix.version }}-arm64
+
+          docker manifest push kooldev/node:${{ matrix.version }}