From ff6c0eae67574fd70da2f2b73afce19be53c7766 Mon Sep 17 00:00:00 2001 From: Milap Sheth Date: Thu, 21 Sep 2023 19:58:23 -0400 Subject: [PATCH] fix dockerfile --- .github/workflows/build-latest-docker-image.yaml | 4 +++- Dockerfile | 3 ++- Makefile | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-latest-docker-image.yaml b/.github/workflows/build-latest-docker-image.yaml index bc176780f..17d93f631 100644 --- a/.github/workflows/build-latest-docker-image.yaml +++ b/.github/workflows/build-latest-docker-image.yaml @@ -49,8 +49,10 @@ jobs: - name: Build docker image (debug) if: github.event.inputs.buildDebug != 'false' + env: + WASM: ${{ github.event.inputs.WASM }} run: | - make docker-image-debug + make WASM="${WASM}" docker-image-debug - name: Push to ECR (debug) uses: jwalton/gh-ecr-push@v1 diff --git a/Dockerfile b/Dockerfile index fc56e1071..9dfd40afa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,8 @@ ARG WASM=false RUN apk add --no-cache --update \ ca-certificates \ git \ - make + make \ + build-base WORKDIR axelar diff --git a/Makefile b/Makefile index 9e89a83a3..a277ad463 100644 --- a/Makefile +++ b/Makefile @@ -134,13 +134,14 @@ build-push-docker-images-rosetta: populate-bytecode guard-SEMVER @DOCKER_BUILDKIT=1 docker buildx build -f Dockerfile.rosetta \ --platform linux/amd64 \ --output "type=image,push=${PUSH_DOCKER_IMAGE}" \ + --build-arg WASM="${WASM}" \ -t axelarnet/axelar-core:${SEMVER}-rosetta . # Build a docker image that is able to run dlv and a debugger can be hooked up to .PHONY: docker-image-debug docker-image-debug: - @DOCKER_BUILDKIT=1 docker build -t axelar/core-debug -f ./Dockerfile.debug . + @DOCKER_BUILDKIT=1 docker build --build-arg WASM="${WASM}" -t axelar/core-debug -f ./Dockerfile.debug . # Install all generate prerequisites .Phony: prereqs