[v1] docker image for mesh-serve (#7283)

Author: enisdenjo

.changeset/config.json

@@ -5,7 +5,7 @@
   "access": "restricted",
   "baseBranch": "master",
   "updateInternalDependencies": "patch",
-  "ignore": ["website", "@graphql-mesh/container"],
+  "ignore": ["website"],
   "changelog": ["@changesets/changelog-github", { "repo": "urigo/graphql-mesh" }],
   "snapshot": {
     "useCalculatedVersion": true,

.dockerignore

@@ -0,0 +1 @@
+.gitignore

.github/workflows/release.yml

@@ -1,9 +1,11 @@
 name: release
+
 on:
   push:
     branches:
       - master
   pull_request:
+
 jobs:
   stable:
     if: github.ref == 'refs/heads/master'
@@ -16,101 +18,48 @@ jobs:
       githubToken: ${{ secrets.GITHUB_TOKEN }}
       npmToken: ${{ secrets.NODE_AUTH_TOKEN }}
 
-  docker-build:
-    # disable publishing images on master until #7283 lands (has better image that should be used instead)
-    if: false
+  docker:
     runs-on: ubuntu-latest
+    env:
+      VERSION: ${{ github.ref == 'refs/heads/master' && 'latest' || github.sha }} # TODO: actual versions to publish
     steps:
       - name: checkout
         uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
+      - name: set up docker buildx
         uses: docker/setup-buildx-action@v3
-
-      - name: Create Docker Buildx builder
-        run: docker buildx create --name mybuilder --use
-
-      - name: Inspect Docker Buildx builder
-        run: docker buildx inspect --bootstrap
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
+      - name: log in to ghcr
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build Docker image for local testing
-        id: build-single
-        uses: docker/build-push-action@v6
+      - name: setup env
+        uses: the-guild-org/shared-config/setup@main
         with:
-          context: ./docker
-          push: false
-          load: true
-          platforms: linux/amd64
-          tags: ghcr.io/ardatan/mesh-serve:test
-
-      - name: Use Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 18
-          cache: 'yarn'
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Run E2E tests
-        run: yarn test:e2e -- docker-image
-
-      - name: Prepare Bake inputs
-        id: docker-bake-inputs
+          nodeVersion: 18
+          packageManagerVersion: modern
+      - name: prepare
+        run: yarn prebuild
+      - name: bundle
+        run: yarn bundle
+      - name: version
         run: |
-          targets=$(docker buildx bake -f docker/docker.hcl --print default | jq -r '.group.default.targets[]')
-          input_set=""
-          first=0
-
-          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-
-          echo "set<<$EOF" >> "$GITHUB_ENV"
-          for target in $targets
-          do
-              echo "$target.cache-from=type=gha,ignore-error=true,scope=$GITHUB_REF-$target" >> "$GITHUB_ENV"
-              echo "$target.cache-to=type=gha,ignore-error=true,mode=max,scope=$GITHUB_REF-$target" >> "$GITHUB_ENV"
-          done
-          echo "$EOF" >> "$GITHUB_ENV"
-
-      - name: Build docker images
-        timeout-minutes: 360
-        id: docker-bake
-        env:
-          DOCKER_REGISTRY: ghcr.io/ardatan/
-          COMMIT_SHA: ${{ github.sha }}
-          BRANCH_NAME: ${{ github.ref_name }}
-          BUILD_TYPE: 'publish'
-          PWD: ${{ github.workspace }}
-          BUILD_STABLE: ${{ github.event_name == 'push' && '1' || '' }}
-        uses: docker/bake-action@v5
+          echo "VERSION=${{ github.ref == 'refs/heads/master' && 'latest' || '$(git rev-parse --short HEAD)' }}" >> $GITHUB_ENV
+      - name: bake and push
+        uses: docker/bake-action@v4
         with:
           provenance: false
-          push: true
-          files: docker/docker.hcl
-          targets: default
           set: |
-            ${{ steps.docker-bake-inputs.outputs.set }}
-            graphql-mesh.args.COMMIT_SHA=${{ github.sha }}
-            graphql-mesh.args.BRANCH_NAME=${{ github.ref_name }}
-
-      - name: Log out of GitHub Container Registry
-        run: docker logout ghcr.io
-
-      - name: Comment on PR with Docker image
+            *.cache-from=type=gha
+            *.cache-to=type=gha,mode=max
+          push: true
+      - name: comment on pr
         if: github.event_name == 'pull_request'
         uses: marocchino/sticky-pull-request-comment@v2
         with:
-          token: ${{ secrets.GH_API_TOKEN }}
-          header: Docker Image
+          header: Docker Images
           message: |
-            The Docker image for this PR is available at:
+            Published images for this PR are available at:
             ```
-            ghcr.io/ardatan/mesh-serve:${{ github.sha }}
+            ghcr.io/ardatan/mesh-serve:${{ env.VERSION }}
             ```

.github/workflows/tests.yml

@@ -345,13 +345,28 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: the-guild-org/shared-config/setup@main
-        name: setup env
+      - name: set up docker buildx
+        uses: docker/setup-buildx-action@v3
+      - name: setup env
+        uses: the-guild-org/shared-config/setup@main
         with:
           nodeVersion: ${{matrix.node-version}}
           packageManagerVersion: modern
-      - name: Prepare for build
+      - name: prepare
         run: yarn prebuild
+      # we only bundle and bake to speed up e2es and avoid timeouts
+      - name: bundle
+        run: yarn bundle
+      - name: bake
+        uses: docker/bake-action@v4
+        with:
+          set: |
+            *.platform=linux/amd64
+            *.cache-from=type=gha
+            *.cache-to=type=gha,mode=max
+          # we must load so that the e2e tests can use the cached image
+          # also, in order for loading to work - we must define the platform above
+          load: true
       - name: test
         timeout-minutes: 5
-        run: yarn test:e2e --detectOpenHandles --testPathIgnorePatterns="e2e/docker-image/"
+        run: yarn test:e2e --detectOpenHandles

.gitignore

@@ -1,6 +1,7 @@
 node_modules/
 temp
 dist/
+bundle/
 out
 build
 generated

docker-bake.hcl

@@ -0,0 +1,13 @@
+group "default" {
+  targets = ["mesh-serve"]
+}
+
+variable "VERSION" {
+  default = "dev"
+}
+
+target "mesh-serve" {
+  context = "packages/serve-cli"
+  platforms = ["linux/amd64", "linux/arm64"]
+  tags = ["ghcr.io/ardatan/mesh-serve:${VERSION}"]
+}