Skip to content

Commit

Permalink
Reflect comments
Browse files Browse the repository at this point in the history
Signed-off-by: Daichi Sakaue <[email protected]>
  • Loading branch information
yokaze committed Dec 25, 2024
1 parent 622d952 commit 7bc35e9
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions cilium/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,12 @@ RUN CODENAME=$(echo ${GOLANG_IMAGE} | cut -d- -f2); \
apt-get update && \
apt-get upgrade -y --no-install-recommends && \
apt-get install -y --no-install-recommends \
ca-certificates \
# Multi-arch cross-compilation packages
gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross binutils-aarch64-linux-gnu \
gcc-x86-64-linux-gnu g++-x86-64-linux-gnu libc6-dev-amd64-cross binutils-x86-64-linux-gnu \
libc6-dev \
# Envoy Build dependencies
autoconf automake cmake coreutils curl git libtool make ninja-build patch patchelf \
python3 python-is-python3 unzip virtualenv wget zip \
# Cilium-envoy build dependencies
Expand Down Expand Up @@ -169,12 +172,14 @@ RUN apt-get update && \
apt-get install -y libmnl0 libnetfilter-conntrack3 libnfnetlink0 libnftnl11 && \
rm -rf /var/lib/apt/lists/*

WORKDIR /go/src/github.com/cilium/cilium/images/runtime
RUN --mount=type=bind,readwrite,source=src/cilium/images/runtime,target=/go/src/github.com/cilium/cilium/images/runtime \
./install-runtime-deps.sh

COPY --from=cilium-iptables /iptables /iptables
RUN dpkg -i /iptables/*\.deb && rm -rf /iptables

WORKDIR /go/src/github.com/cilium/cilium/images/runtime
RUN --mount=type=bind,readwrite,source=src/cilium/images/runtime,target=/go/src/github.com/cilium/cilium/images/runtime \
./install-runtime-deps.sh && \
./iptables-wrapper-installer.sh --no-sanity-check

COPY --from=cilium-llvm /usr/local/bin/clang /usr/local/bin/llc /usr/local/bin/
Expand Down

0 comments on commit 7bc35e9

Please sign in to comment.