Skip to content

Commit

Permalink
fix bug
Browse files Browse the repository at this point in the history
  • Loading branch information
mask-pp committed Sep 24, 2024
1 parent 2673017 commit 65f83a2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/taiko-client--docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
with:
context: .
file: packages/taiko-client/Dockerfile
platforms: linux/arm64
platforms: linux/arm64,linux/amd64
push: false
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
12 changes: 6 additions & 6 deletions packages/taiko-client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ ARG TARGETOS
ARG TARGETARCH

RUN apt-get update && apt-get install -y git make g++-x86-64-linux-gnu libc6-dev-amd64-cross
#RUN apk update && apk add --no-cache --update gcc musl-dev linux-headers git make build-base

WORKDIR /build

Expand All @@ -12,11 +11,12 @@ COPY go.mod go.sum ./
COPY packages/taiko-client/ packages/taiko-client/

WORKDIR /build/packages/taiko-client

#RUN CGO_ENABLED=1 CC=x86_64-linux-gnu-gcc GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build
echo "Building for ${TARGETOS}/${TARGETARCH}"
RUN CGO_ENABLED=1 GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build

RUN echo "TARGETOS=${TARGETOS}, TARGETARCH=${TARGETARCH}" && \
if [ "$TARGETARCH" = "amd64" ]; then \
CGO_ENABLED=1 CC=x86_64-linux-gnu-gcc GOOS=${TARGETOS} GOARCH=${TARGETARCH} make build; \
else \
make build; \
fi

FROM alpine:latest

Expand Down

0 comments on commit 65f83a2

Please sign in to comment.