diff --git a/Dockerfile b/Dockerfile index 5fd9490650cb..791650079093 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN make LOCKDEBUG=$LOCKDEBUG PKG_BUILD=1 V=$V LIBNETWORK_PLUGIN=$LIBNETWORK_PLU # built while allowing the new versions to make changes that are not # backwards compatible. # -FROM quay.io/cilium/cilium-runtime:2020-03-25 +FROM quay.io/cilium/cilium-runtime:2020-04-02 LABEL maintainer="maintainer@cilium.io" COPY --from=builder /tmp/install / COPY --from=cilium-envoy / / diff --git a/cilium-dev.Dockerfile b/cilium-dev.Dockerfile index 5627af974e34..91d940f54f93 100644 --- a/cilium-dev.Dockerfile +++ b/cilium-dev.Dockerfile @@ -3,7 +3,7 @@ # development environmennt FROM quay.io/cilium/cilium-envoy:63de0bd958d05d82e2396125dcf6286d92464c56 as cilium-envoy -FROM quay.io/cilium/cilium-runtime:2020-02-27 +FROM quay.io/cilium/cilium-runtime:2020-04-02 LABEL maintainer="maintainer@cilium.io" RUN apt-get install make -y WORKDIR /go/src/github.com/cilium/cilium diff --git a/contrib/packaging/docker/Dockerfile.runtime b/contrib/packaging/docker/Dockerfile.runtime index ae388bb8f6cd..3e849cc5f474 100644 --- a/contrib/packaging/docker/Dockerfile.runtime +++ b/contrib/packaging/docker/Dockerfile.runtime @@ -44,6 +44,8 @@ apt-get install -y --no-install-recommends \ # git clone --depth 1 -b static-data https://github.com/cilium/iproute2.git iproute2 && \ cd iproute2 && \ +git --no-pager remote -v && \ +git --no-pager log -1 && \ ./configure && \ make -j `getconf _NPROCESSORS_ONLN` && \ strip tc/tc && \ @@ -56,6 +58,8 @@ git clone -b master https://github.com/llvm/llvm-project.git llvm && \ mkdir -p llvm/llvm/build/install && \ cd llvm/ && \ git checkout -b d941df363d1cb621a3836b909c37d79f2a3e27e2 d941df363d1cb621a3836b909c37d79f2a3e27e2 && \ +git --no-pager remote -v && \ +git --no-pager log -1 && \ cd llvm/build && \ cmake .. -G "Ninja" -DLLVM_TARGETS_TO_BUILD="BPF" -DLLVM_ENABLE_PROJECTS="clang" -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DLLVM_BUILD_RUNTIME=OFF && \ ninja && \ @@ -69,6 +73,8 @@ cd ../../../ && \ # git clone --depth 1 -b master git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git linux && \ cd linux/tools/bpf/bpftool/ && \ +git --no-pager remote -v && \ +git --no-pager log -1 && \ make -j `getconf _NPROCESSORS_ONLN` && \ strip bpftool && \ cd ../../../../ && \ @@ -101,6 +107,8 @@ WORKDIR /tmp RUN go get -d github.com/google/gops && \ cd /go/src/github.com/google/gops && \ git checkout -b v0.3.6 v0.3.6 && \ +git --no-pager remote -v && \ +git --no-pager log -1 && \ go install && \ strip /go/bin/gops