fix: Minor fix to docker bake github actions

Signed-off-by: Diwank Singh Tomer <[email protected]>
julep-ai · Sep 28, 2024 · 0e1a5c6 · 0e1a5c6
1 parent 2a82893
commit 0e1a5c6
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 16 deletions.
diff --git a/.github/workflows/dev-push-to-hub.yml b/.github/workflows/dev-push-to-hub.yml
@@ -13,12 +13,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set branch name
-        id: variables
-        run: |
-          echo "branch_name=$(echo ${GITHUB_REF#refs/heads/} | tr '/' '-')" >> $GITHUB_OUTPUT
-          echo "git_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -29,7 +23,7 @@ jobs:
           password: "${{ secrets.DOCKER_HUB_PASSWORD }}"
 
       - name: Build and push agent images
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v5
         with:
           files: |
             ./docker-bake.hcl
@@ -38,8 +32,8 @@ jobs:
           set: |
             *.cache-from=type=gha
             *.cache-to=type=gha,mode=max
-            *.args.TAG=${{ steps.variables.outputs.branch_name }}
-            *.args.GIT_SHA=${{ steps.variables.outputs.git_sha }}
+            *.args.TAG=dev
+            *.args.GIT_SHA=${{ github.sha }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.github/workflows/docker-bake-on-pr.yml b/.github/workflows/docker-bake-on-pr.yml
@@ -0,0 +1,38 @@
+name: Bake images on PR
+run-name: ${{ github.actor }} is baking images
+
+on:
+  pull_request:
+
+jobs:
+  Bake-Images:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: julepai
+          password: "${{ secrets.DOCKER_HUB_PASSWORD }}"
+
+      - name: Bake images
+        uses: docker/bake-action@v5
+        with:
+          files: |
+            ./docker-bake.hcl
+          targets: agents-api
+          push: false
+          set: |
+            *.cache-from=type=gha
+            *.cache-to=type=gha,mode=max
+            *.args.TAG=pr-${{ github.ref_name }}
+            *.args.GIT_SHA=${{ github.sha }}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/dev' }}
diff --git a/.github/workflows/main-push-to-hub.yml b/.github/workflows/main-push-to-hub.yml
@@ -13,11 +13,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set git sha
-        id: variables
-        run: |
-          echo "git_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -28,7 +23,7 @@ jobs:
           password: "${{ secrets.DOCKER_HUB_PASSWORD }}"
 
       - name: Build and push agent images
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v5
         with:
           files: |
             ./docker-bake.hcl
@@ -38,7 +33,7 @@ jobs:
             *.cache-from=type=gha
             *.cache-to=type=gha,mode=max
             *.args.TAG=latest
-            *.args.GIT_SHA=${{ steps.variables.outputs.git_sha }}
+            *.args.GIT_SHA=${{ github.sha }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}