Adds support for multi-platform linux/amd64 & linux/arm64 docker images

.github/workflows/docker-publish-release.yaml

@@ -67,12 +67,9 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
       if: ${{ success() }}
 
-    # Build And Push Image
-    - name: Build docker image release
-      run: make docker-release-build
-      if: ${{ success() }}
-
-    # Publish if release is tagged or force == true
-    - name: Push docker image release
-      run: make docker-release-push
+    - name: Set release PUSH_FLAG
+      run: echo "PUSH_FLAG=--push" >> $GITHUB_ENV
       if: startsWith(github.ref, 'refs/tags/v') || github.event.inputs.force == 'true'
+
+    - name: Build (and potentially push) docker image release
+      run: PUSH_FLAG=$PUSH_FLAG make docker-release-build

.github/workflows/docker-publish.yaml

@@ -1,8 +1,9 @@
-name: docker-publish
+name: docker-publish-internal
 on:
   push:
     branches:
       - master
+      - pschork/multi-platform-releases
   pull_request:
   workflow_dispatch:
 
@@ -19,7 +20,9 @@ jobs:
       packages: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup Buildx
         uses: docker/setup-buildx-action@v1
@@ -45,12 +48,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Build And Push Image
-      - name: Build Docker image
-        run: docker compose -f docker-compose-build.yaml build
-      - name: Push Docker image
+      - name: Set internal release PUSH_FLAG
+        run: echo "PUSH_FLAG=--push" >> $GITHUB_ENV
         if: github.ref == 'refs/heads/master'
-        run: docker compose -f docker-compose-build.yaml push
+
+      - name: Build (and potentially push) internal docker image release
+        run: PUSH_FLAG=$PUSH_FLAG make docker-internal-build
 
       - name: Send GitHub Action trigger data to Slack workflow
         if: ${{ failure() }}

GitVersion.yml

@@ -19,7 +19,7 @@ branches:
     increment: None
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-    regex: ^v*|^releases?[/-]
+    regex: ^v\d+\.\d+\.\d+$|^releases?[/-]
     source-branches:
     - main
     - release

Makefile

@@ -93,11 +93,11 @@ integration-tests-dataapi:
 	make dataapi-build
 	go test -v ./disperser/dataapi
 
-docker-release-build:
-	RELEASE_TAG=${SEMVER} docker compose -f docker-compose-release.yaml build --build-arg SEMVER=${SEMVER} --build-arg GITCOMMIT=${GITCOMMIT} --build-arg GITDATE=${GITDATE} 
+docker-internal-build:
+	RELEASE_TAG=latest docker compose -f docker-compose-internal.yaml build --build-arg SEMVER=${SEMVER} --build-arg GITCOMMIT=${GITCOMMIT} --build-arg GITDATE=${GITDATE} ${PUSH_FLAG}
 
-docker-release-push:
-	RELEASE_TAG=${SEMVER} docker compose -f docker-compose-release.yaml push
+docker-release-build:
+	RELEASE_TAG=${SEMVER} docker compose -f docker-compose-release.yaml build --build-arg SEMVER=${SEMVER} --build-arg GITCOMMIT=${GITCOMMIT} --build-arg GITDATE=${GITDATE} ${PUSH_FLAG}
 
 semver:
 	echo "${SEMVER}"

docker-compose-build.yaml → docker-compose-internal.yaml

@@ -24,6 +24,9 @@ services:
     build:
       context: .
       dockerfile: node/cmd/Dockerfile
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
     image: ghcr.io/layr-labs/eigenda/node:${BUILD_TAG:-latest}
   churner:
     build:

docker-compose-release.yaml

@@ -4,9 +4,15 @@ services:
     build:
       context: .
       dockerfile: node/cmd/Dockerfile
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
     image: ghcr.io/layr-labs/eigenda/opr-node:${RELEASE_TAG}
   nodeplugin:
     build:
       context: .
       dockerfile: node/plugin/cmd/Dockerfile
+      platforms:
+        - "linux/amd64"
+        - "linux/arm64"
     image: ghcr.io/layr-labs/eigenda/opr-nodeplugin:${RELEASE_TAG}