Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(taiko-client): revert building changes #18174

Merged
merged 1 commit into from
Sep 25, 2024
Merged

chore(taiko-client): revert building changes #18174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/taiko-client--docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v1

- name: Docker meta
id: meta
Expand All @@ -46,11 +46,11 @@ jobs:
type=sha

- name: Build and push
uses: docker/build-push-action@v6
uses: docker/build-push-action@v5
with:
context: .
file: packages/taiko-client/Dockerfile
platforms: linux/arm64,linux/amd64
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
14 changes: 4 additions & 10 deletions packages/taiko-client/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
FROM --platform=$BUILDPLATFORM golang:1.21 AS builder
ARG TARGETOS
ARG TARGETARCH
FROM golang:1.21-alpine as builder

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 @@ -11,12 +9,8 @@ COPY go.mod go.sum ./
COPY packages/taiko-client/ packages/taiko-client/

WORKDIR /build/packages/taiko-client
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

RUN make build

FROM alpine:latest

Expand Down
Loading