diff --git a/.github/workflows/docker-publish-release.yaml b/.github/workflows/docker-publish-release.yaml index 60f19ed027..dc8d66245f 100644 --- a/.github/workflows/docker-publish-release.yaml +++ b/.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 diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 48163f0184..3a69ab7891 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -1,4 +1,4 @@ -name: docker-publish +name: docker-publish-internal on: push: branches: @@ -19,7 +19,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 @@ -47,10 +49,10 @@ jobs: # Build And Push Image - name: Build Docker image - run: docker compose -f docker-compose-build.yaml build + run: docker compose -f docker-compose-internal.yaml build - name: Push Docker image if: github.ref == 'refs/heads/master' - run: docker compose -f docker-compose-build.yaml push + run: docker compose -f docker-compose-internal.yaml push - name: Send GitHub Action trigger data to Slack workflow if: ${{ failure() }} diff --git a/GitVersion.yml b/GitVersion.yml index 52981c4aca..062979b1e0 100644 --- a/GitVersion.yml +++ b/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 diff --git a/Makefile b/Makefile index c40ad271c5..acd3b2d3a5 100644 --- a/Makefile +++ b/Makefile @@ -94,10 +94,7 @@ integration-tests-dataapi: 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-release-push: - RELEASE_TAG=${SEMVER} docker compose -f docker-compose-release.yaml push + 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}" diff --git a/docker-compose-build.yaml b/docker-compose-internal.yaml similarity index 100% rename from docker-compose-build.yaml rename to docker-compose-internal.yaml diff --git a/docker-compose-release.yaml b/docker-compose-release.yaml index a6e74e4ecf..2cd3ccfc32 100644 --- a/docker-compose-release.yaml +++ b/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}