From 75f8467b8652aff8c72dc222ed6fd3c161832eea Mon Sep 17 00:00:00 2001 From: Kate Goldenring Date: Thu, 18 Nov 2021 17:11:28 +0000 Subject: [PATCH] Condense two RUN statements Signed-off-by: Kate Goldenring --- build/containers/Dockerfile.agent | 12 +++++------- build/containers/Dockerfile.agent-full | 6 ++---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/build/containers/Dockerfile.agent b/build/containers/Dockerfile.agent index db024c9c3..c56e1caf3 100644 --- a/build/containers/Dockerfile.agent +++ b/build/containers/Dockerfile.agent @@ -9,16 +9,14 @@ RUN echo "Using Rust binaries from ${CROSS_BUILD_TARGET}/${BUILD_TYPE}" # Link the container to the Akri repository LABEL org.opencontainers.image.source https://github.com/project-akri/akri -RUN apt-get update && apt-get install -y --no-install-recommends libssl-dev openssl curl ca-certificates && apt-get clean - -COPY ./target/${CROSS_BUILD_TARGET}/${BUILD_TYPE}/agent /agent - -# Install crictl -RUN VERSION="v1.17.0" && \ +# Install crictl and openssl dependencies +RUN apt-get update && apt-get install -y --no-install-recommends libssl-dev openssl curl ca-certificates && + VERSION="v1.17.0" && \ curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-amd64.tar.gz --output crictl-$VERSION-linux-amd64.tar.gz && \ tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin && \ rm -f crictl-$VERSION-linux-amd64.tar.gz && \ apt-get remove -y curl ca-certificates && apt-get clean - + +COPY ./target/${CROSS_BUILD_TARGET}/${BUILD_TYPE}/agent /agent ENV RUST_LOG agent,akri_shared CMD ["./agent"] diff --git a/build/containers/Dockerfile.agent-full b/build/containers/Dockerfile.agent-full index 0e5133f63..79277702a 100644 --- a/build/containers/Dockerfile.agent-full +++ b/build/containers/Dockerfile.agent-full @@ -9,10 +9,8 @@ RUN echo "Using Rust binaries from ${CROSS_BUILD_TARGET}/${BUILD_TYPE}" # Link the container to the Akri repository LABEL org.opencontainers.image.source https://github.com/project-akri/akri -RUN apt-get update && apt-get install -y --no-install-recommends libssl-dev openssl curl ca-certificates && apt-get clean - -# Install crictl -RUN VERSION="v1.17.0" && \ +RUN apt-get update && apt-get install -y --no-install-recommends libssl-dev openssl curl ca-certificates && + VERSION="v1.17.0" && \ curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-$VERSION-linux-amd64.tar.gz --output crictl-$VERSION-linux-amd64.tar.gz && \ tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin && \ rm -f crictl-$VERSION-linux-amd64.tar.gz && \