Skip to content

Commit d30863d

Browse files
committed
update build
1 parent 0928633 commit d30863d

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:0147a23fdada32bd51b4f313c645bcb
22
ARG CILIUM_BPFTOOL_IMAGE=quay.io/cilium/cilium-bpftool:b5ba881d2a7ec68d88ecd72efd60ac551c720701@sha256:458282e59657b8f779d52ae2be2cdbeecfe68c3d807ff87c97c8d5c6f97820a9
33
ARG CILIUM_IPROUTE2_IMAGE=quay.io/cilium/cilium-iproute2:4db2c4bdf00ce461406e1c82aada461356fac935@sha256:e4c9ba92996a07964c1b7cd97c4aac950754ec75d7ac8c626a99c79acd0479ab
44

5-
FROM ${CILIUM_LLVM_IMAGE} as llvm-dist
6-
FROM ${CILIUM_BPFTOOL_IMAGE} as bpftool-dist
7-
FROM ${CILIUM_IPROUTE2_IMAGE} as iproute2-dist
5+
FROM --platform=$BUILDPLATFORM ${CILIUM_LLVM_IMAGE} as llvm-dist
6+
FROM --platform=$BUILDPLATFORM ${CILIUM_BPFTOOL_IMAGE} as bpftool-dist
7+
FROM --platform=$BUILDPLATFORM ${CILIUM_IPROUTE2_IMAGE} as iproute2-dist
88

9-
FROM golang:1.17.2 as builder
9+
FROM --platform=$BUILDPLATFORM golang:1.17.2 as builder
1010
ARG GOPROXY
1111
ENV GOPROXY $GOPROXY
1212
WORKDIR /go/src/github.com/AliyunContainerService/terway/
@@ -22,7 +22,7 @@ RUN cd cmd/terway && CGO_ENABLED=0 GOOS=linux go build -tags default_build \
2222
RUN cd plugin/terway && CGO_ENABLED=0 GOOS=linux go build -o terway .
2323
RUN cd cmd/terway-cli && CGO_ENABLED=0 GOOS=linux go build -o terway-cli .
2424

25-
FROM calico/go-build:v0.57 as felix-builder
25+
FROM --platform=$BUILDPLATFORM calico/go-build:v0.57 as felix-builder
2626
ARG GOPROXY
2727
ENV GOPROXY $GOPROXY
2828
ENV GIT_BRANCH=v3.20.2
@@ -44,7 +44,7 @@ RUN cd /go/src/github.com/projectcalico/felix && \
4444
( echo "Error: bin/calico-felix was not statically linked"; false ) ) \
4545
&& chmod +x /go/src/github.com/projectcalico/felix/bin/calico-felix
4646

47-
FROM quay.io/cilium/cilium-builder:6ad397fc5d0e2ccba203d5c0fe5a4f0a08f6fb5a@sha256:d760b821c46ce41361a2d54386b12fd9831fbc0ba36539b86604706dd68f05d1 as cilium-builder
47+
FROM --platform=$BUILDPLATFORM quay.io/cilium/cilium-builder:6ad397fc5d0e2ccba203d5c0fe5a4f0a08f6fb5a@sha256:d760b821c46ce41361a2d54386b12fd9831fbc0ba36539b86604706dd68f05d1 as cilium-builder
4848
ARG GOPROXY
4949
ENV GOPROXY $GOPROXY
5050
ARG CILIUM_SHA=""
@@ -71,7 +71,7 @@ RUN cd cilium && make NOSTRIP=$NOSTRIP LOCKDEBUG=$LOCKDEBUG PKG_BUILD=1 V=$V LIB
7171
SKIP_DOCS=true DESTDIR=/tmp/install clean-container build-container install-container
7272
RUN cp /tmp/install/opt/cni/bin/cilium-cni /tmp/install/usr/bin/
7373

74-
FROM ubuntu:20.04
74+
FROM --platform=$BUILDPLATFORM ubuntu:20.04
7575
RUN apt-get update && apt-get install -y kmod libelf1 libmnl0 iptables nftables kmod curl ipset bash ethtool bridge-utils socat grep findutils jq conntrack iputils-ping && \
7676
apt-get purge --auto-remove && apt-get clean && rm -rf /var/lib/apt/lists/*
7777
COPY --from=llvm-dist /usr/local/bin/clang /usr/local/bin/llc /bin/

Dockerfile.controlplane

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.17.2 as builder
1+
FROM --platform=$BUILDPLATFORM golang:1.17.2 as builder
22
ARG GOPROXY
33
ENV GOPROXY $GOPROXY
44
WORKDIR /go/src/github.com/AliyunContainerService/terway/
@@ -12,7 +12,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -tags default_build \
1212
-X \"k8s.io/client-go/pkg/version.buildDate=`date -u +'%Y-%m-%dT%H:%M:%SZ'`\"" \
1313
-o terway-controlplane cmd/terway-controlplane/terway-controlplane.go
1414

15-
FROM ubuntu:20.04
15+
FROM --platform=$BUILDPLATFORM ubuntu:20.04
1616
RUN apt-get update && apt-get install -y curl jq && \
1717
apt-get purge --auto-remove && apt-get clean && rm -rf /var/lib/apt/lists/*
1818
COPY --from=builder /go/src/github.com/AliyunContainerService/terway/terway-controlplane /usr/bin/terway-controlplane

0 commit comments

Comments
 (0)