Merge pull request #55 from zapier/split-image-binary

fix the release script, remove 'docker' refs

.github/workflows/on_tag.yaml → .github/workflows/on_release.yaml

@@ -6,7 +6,7 @@ on:
     types: [published]
 
 jobs:
-  release:
+  release-binaries:
     runs-on: ubuntu-22.04
 
     steps:
@@ -31,12 +31,44 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push the Docker image
+      - name: Build and push the binaries
         run: |
           earthly \
             --push \
-            +release \
+            +release-binaries \
             --version=${{ env.RELEASE_VERSION }} \
             --commitSHA=${{ env.SHORT_SHA }}
-            --image_name=ghcr.io/${{ github.repository_owner }}/prom-aggregation-gateway \
-            --token ${{ secrets.GITHUB_TOKEN }}
+
+  release-image:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: checkout the source code
+        uses: actions/checkout@v3
+
+      - uses: wistia/[email protected]
+
+      - uses: earthly/actions-setup@v1
+        with: { version: "v${{ env.EARTHLY_TOOL_VERSION }}" }
+
+      - name: Extract tag name
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - name: Extract short sha
+        run: echo "SHORT_SHA=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_ENV
+
+      - name: login to registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push the Docker image
+        run: |
+          earthly \
+            --push \
+            +build-image \
+            --version=${{ env.RELEASE_VERSION }} \
+            --commitSHA=${{ env.SHORT_SHA }} \
+            --image_name=ghcr.io/${{ github.repository_owner }}/prom-aggregation-gateway

Earthfile

@@ -27,12 +27,12 @@ ci-helm:
     BUILD +test-helm
 
 build:
-    BUILD +build-docker
+    BUILD +build-image
     BUILD +build-helm
 
 release:
     BUILD +release-binaries
-    BUILD +build-docker
+    BUILD +build-image
 
 go-deps:
     FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION}
@@ -50,7 +50,7 @@ build-binary:
 
     SAVE ARTIFACT ./prom-aggregation-gateway
 
-build-docker:
+build-image:
     FROM alpine:${ALPINE_VERSION}
     COPY +build-binary/prom-aggregation-gateway .
     ENV GIN_MODE=release

Earthfile.md

@@ -1,17 +1,17 @@
 ```mermaid
 graph TD
-        build --> build-docker
-        build --> build-helm
-        build-docker --> build-binary
-        continuous-deploy --> build-helm
-        lint-golang --> go-deps
-        test-golang --> go-deps
-        test --> ci-golang
-        release --> build-docker
-        release --> release-binaries
-        build-binary --> go-deps
-        ci-golang --> lint-golang
-        ci-golang --> test-golang
-        ci-helm --> test-helm
-        release-binaries --> build-binaries
+	build --> build-helm
+	build --> build-image
+	build-binary --> go-deps
+	build-image --> build-binary
+	ci-golang --> lint-golang
+	ci-golang --> test-golang
+	ci-helm --> test-helm
+	continuous-deploy --> build-helm
+	lint-golang --> go-deps
+	release --> build-image
+	release --> release-binaries
+	release-binaries --> build-binaries
+	test --> ci-golang
+	test-golang --> go-deps
 ```

skaffold.yaml

@@ -7,7 +7,7 @@ build:
   artifacts:
     - image: prom-aggregation-gateway
       custom:
-        buildCommand: earthly +build-docker --version=$IMAGE_TAG --image_name=$IMAGE_REPO
+        buildCommand: earthly +build-image --version=$IMAGE_TAG --image_name=$IMAGE_REPO
   tagPolicy:
     customTemplate:
       template: dev