Enhanced Dockerfile for cross compilation (test Jenkinsfile changes)

.dockerignore

@@ -1,4 +1,3 @@
-.git
 .go-pkg-cache
 .gopath
 bundles

.github/workflows/ci.yml

@@ -15,17 +15,22 @@ on:
   pull_request:
 
 env:
-  BUNDLES_OUTPUT: ./bundles
+  PLATFORM: "Moby Engine"
+  PRODUCT: "Moby"
+  DEFAULT_PRODUCT_LICENSE: "Moby"
+  PACKAGER_NAME: "Moby"
 
 jobs:
-  build:
+  binary:
     runs-on: ubuntu-20.04
+    env:
+      DESTDIR: ./build
     strategy:
       fail-fast: false
       matrix:
-        target:
-          - binary
-          - dynbinary
+        linkmode:
+          - static
+          - dynamic
     steps:
       -
         name: Checkout
@@ -39,34 +44,57 @@ jobs:
         name: Build
         uses: docker/bake-action@v1
         with:
-          targets: ${{ matrix.target }}
+          targets: binary
           set: |
-            *.cache-from=type=gha,scope=build-${{ matrix.target }}
-            *.cache-to=type=gha,scope=build-${{ matrix.target }}
+            *.cache-from=type=gha,scope=build-${{ matrix.linkmode }}
+            *.cache-to=type=gha,scope=build-${{ matrix.linkmode }},mode=max
+        env:
+          DOCKER_LINKMODE: ${{ matrix.linkmode }}
+      -
+        name: List artifacts
+        run: |
+          tree -nh ${{ env.DESTDIR }}
+      -
+        name: Check artifacts
+        run: |
+          find ${{ env.DESTDIR }} -type f -exec file -e ascii -- {} +
       -
         name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ matrix.target }}
-          path: ${{ env.BUNDLES_OUTPUT }}
+          name: binary-${{ matrix.linkmode }}
+          path: ${{ env.DESTDIR }}
           if-no-files-found: error
           retention-days: 7
 
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.platforms.outputs.matrix }}
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Create matrix
+        id: platforms
+        run: |
+          echo ::set-output name=matrix::$(docker buildx bake binary-cross --print | jq -cr '.target."binary-cross".platforms')
+      -
+        name: Show matrix
+        run: |
+          echo ${{ steps.platforms.outputs.matrix }}
+
   cross:
     runs-on: ubuntu-20.04
+    needs:
+      - prepare
+    env:
+      DESTDIR: ./build
     strategy:
       fail-fast: false
       matrix:
-        platform:
-          - linux/amd64
-          - linux/arm/v5
-          - linux/arm/v6
-          - linux/arm/v7
-          - linux/arm64
-          - linux/ppc64le
-          - linux/s390x
-          - windows/amd64
-          - windows/arm64
+        platform: ${{ fromJson(needs.prepare.outputs.matrix) }}
     steps:
       -
         name: Checkout
@@ -78,31 +106,41 @@ jobs:
         run: |
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       -
         name: Build
         uses: docker/bake-action@v1
         with:
-          targets: cross
+          targets: all
           set: |
+            *.platform=${{ matrix.platform }}
             *.cache-from=type=gha,scope=cross-${{ env.PLATFORM_PAIR }}
             *.cache-to=type=gha,scope=cross-${{ env.PLATFORM_PAIR }}
-        env:
-          DOCKER_CROSSPLATFORMS: ${{ matrix.platform }}
+      -
+        name: List artifacts
+        run: |
+          tree -nh ${{ env.DESTDIR }}
+      -
+        name: Check artifacts
+        run: |
+          find ${{ env.DESTDIR }} -type f -exec file -e ascii -- {} +
       -
         name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
           name: cross-${{ env.PLATFORM_PAIR }}
-          path: ${{ env.BUNDLES_OUTPUT }}
+          path: ${{ env.DESTDIR }}
           if-no-files-found: error
           retention-days: 7
 
   test-buildkit:
     needs:
-      - build
+      - binary
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
@@ -147,7 +185,7 @@ jobs:
         name: Download binary artifacts
         uses: actions/download-artifact@v3
         with:
-          name: binary
+          name: binary-static
           path: ./buildkit/build/moby/
       -
         name: Update daemon.json
@@ -163,8 +201,39 @@ jobs:
         env:
           CONTEXT: "."
           TEST_DOCKERD: "1"
-          TEST_DOCKERD_BINARY: "./build/moby/binary-daemon/dockerd"
+          TEST_DOCKERD_BINARY: "./build/moby/dockerd"
           TESTPKGS: "${{ matrix.pkg }}"
           TESTFLAGS: "-v --parallel=1 --timeout=30m --run=//worker=dockerd$"
           SKIP_INTEGRATION_TESTS: "${{ matrix.skip-integration-tests }}"
         working-directory: buildkit
+
+  dev:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        mode:
+          - ""
+          - systemd
+    steps:
+      - name: Prepare
+        run: |
+          if [ "${{ matrix.mode }}" = "systemd" ]; then
+            echo "SYSTEMD=true" >> $GITHUB_ENV
+          fi
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Build dev image
+        uses: docker/bake-action@v2
+        with:
+          targets: dev
+          set: |
+            *.cache-from=type=gha,scope=cross-linux-amd64
+            *.cache-from=type=gha,scope=dev${{ matrix.mode }}
+            *.cache-to=type=gha,scope=dev${{ matrix.mode }},mode=max
+            *.output=type=cacheonly

.github/workflows/simple.yml

@@ -0,0 +1,33 @@
+name: simple
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'master'
+      - '[0-9]+.[0-9]{2}'
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Build simple image
+        uses: docker/bake-action@v2
+        with:
+          targets: simple
+      -
+        name: Build dynbinary
+        run: |
+          docker run --rm docker:simple hack/make.sh dynbinary

.github/workflows/test.yml

@@ -0,0 +1,69 @@
+name: test
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'master'
+      - '[0-9]+.[0-9]{2}'
+    tags:
+      - 'v*'
+  pull_request:
+
+jobs:
+  prepare:
+    runs-on: ubuntu-20.04
+    outputs:
+      matrix: ${{ steps.platforms.outputs.matrix }}
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Create matrix
+        id: platforms
+        run: |
+          echo ::set-output name=matrix::$(docker buildx bake binary-smoketest --print | jq -cr '.target."binary-smoketest".platforms')
+      -
+        name: Show matrix
+        run: |
+          echo ${{ steps.platforms.outputs.matrix }}
+
+  smoke:
+    runs-on: ubuntu-20.04
+    needs:
+      - prepare
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: ${{ fromJson(needs.prepare.outputs.matrix) }}
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      -
+        name: Test
+        uses: docker/bake-action@v2
+        with:
+          targets: binary-smoketest
+          set: |
+            *.platform=${{ matrix.platform }}
+            *.cache-from=type=gha,scope=binary-smoketest-${{ env.PLATFORM_PAIR }}
+            *.cache-to=type=gha,scope=binary-smoketest-${{ env.PLATFORM_PAIR }}
+        env:
+          DOCKER_LINKMODE: static