Tc

datahangar · Feb 15, 2025 · 569a09c · 569a09c
1 parent 5f04a53
commit 569a09c
Showing 1 changed file with 38 additions and 4 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -177,9 +177,12 @@ jobs:
           minikube kubectl -- get pods -o wide
           ( make VERBOSE=1 _check_affinity && ( echo "FAILED: negative test succeeded with cni='${CNI}' nodes='${NODES}' when it should have failed!" && exit 1 ) ) || true
 
-  docker_build_test_publish:
-    needs: [check_unit, check_cni_example]
-    runs-on: ubuntu-22.04
+  docker_tests:
+    runs-on: ${{ matrix.runs-on }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runs-on: [ ubuntu-24.04, ubuntu-24.04-arm ]
     steps:
       - name: "Checkout sfunnel"
         uses: actions/checkout@v4
@@ -206,7 +209,7 @@ jobs:
           echo "Fix mess with tags in actions/checkout..."
           git fetch -f && git fetch -f --tags
 
-          docker buildx build --platform ${PLATFORMS} -t sfunnel --build-arg VERSION="$(git describe)" --build-arg COMMIT="${GITHUB_SHA}" --load -f docker/Dockerfile .
+          docker buildx build -t sfunnel --build-arg VERSION="$(git describe)" --build-arg COMMIT="${GITHUB_SHA}" --load -f docker/Dockerfile .
 
       - name: "[TEST] Run container without env. nor file. Should fail..."
         run: |
@@ -428,6 +431,37 @@ jobs:
             exit 1
           fi
 
+  docker_build_publish:
+    needs: [check_unit, check_cni_example, docker_tests]
+    runs-on: ubuntu-22.04
+    steps:
+      - name: "Checkout sfunnel"
+        uses: actions/checkout@v4
+        with:
+          path: sfunnel
+          fetch-depth: 0
+          fetch-tags: 1
+
+      - name: "Set up Docker buildx"
+        uses: docker/setup-buildx-action@v3
+
+      - name: "Login to GitHub Container Registry (ghcr.io)"
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.GITHUB_TOKEN}}
+
+      - name: "Build container"
+        run: |
+          #Cross-build
+          cd sfunnel
+
+          echo "Fix mess with tags in actions/checkout..."
+          git fetch -f && git fetch -f --tags
+
+          docker buildx build --platform ${PLATFORMS} -t sfunnel --build-arg VERSION="$(git describe)" --build-arg COMMIT="${GITHUB_SHA}" --load -f docker/Dockerfile .
+
       - name: "Push to ghcr"
         run: |
           cd sfunnel