From fcd211b9bb30d3f1d5355fd08fb6a4bd5efac5b6 Mon Sep 17 00:00:00 2001 From: Patrick Schork <354473+pschork@users.noreply.github.com> Date: Fri, 14 Jun 2024 14:30:41 -0700 Subject: [PATCH] Revert "Add multi-platform build to internal node builds" This reverts commit 8c82532705c67f63178ef15db0392212b65c9f41. --- .github/workflows/docker-publish.yaml | 11 +++++------ Makefile | 3 --- docker-compose-internal.yaml | 3 --- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index c221a653fc..3a69ab7891 100644 --- a/.github/workflows/docker-publish.yaml +++ b/.github/workflows/docker-publish.yaml @@ -3,7 +3,6 @@ on: push: branches: - master - - pschork/multi-platform-releases pull_request: workflow_dispatch: @@ -48,12 +47,12 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Set internal release PUSH_FLAG - run: echo "PUSH_FLAG=--push" >> $GITHUB_ENV + # Build And Push Image + - name: Build Docker image + run: docker compose -f docker-compose-internal.yaml build + - name: Push Docker image if: github.ref == 'refs/heads/master' - - - name: Build (and potentially push) internal docker image release - run: PUSH_FLAG=$PUSH_FLAG make docker-internal-build + run: docker compose -f docker-compose-internal.yaml push - name: Send GitHub Action trigger data to Slack workflow if: ${{ failure() }} diff --git a/Makefile b/Makefile index 87a98dff48..acd3b2d3a5 100644 --- a/Makefile +++ b/Makefile @@ -93,9 +93,6 @@ integration-tests-dataapi: make dataapi-build go test -v ./disperser/dataapi -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-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} diff --git a/docker-compose-internal.yaml b/docker-compose-internal.yaml index 6e34d194b4..473aeec17f 100644 --- a/docker-compose-internal.yaml +++ b/docker-compose-internal.yaml @@ -24,9 +24,6 @@ services: build: context: . dockerfile: node/cmd/Dockerfile - platforms: - - "linux/amd64" - - "linux/arm64" image: ghcr.io/layr-labs/eigenda/node:${BUILD_TAG:-latest} churner: build: