From 7214d142da5d912ae40492fcdf58ebb90fdbebbe Mon Sep 17 00:00:00 2001 From: John D <427295+boostchicken@users.noreply.github.com> Date: Thu, 26 Aug 2021 21:47:37 -0700 Subject: [PATCH] Update Dockerfile --- podman-update/build/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/podman-update/build/Dockerfile b/podman-update/build/Dockerfile index 1517db4..63e623c 100644 --- a/podman-update/build/Dockerfile +++ b/podman-update/build/Dockerfile @@ -18,18 +18,18 @@ WORKDIR /build RUN git clone https://github.com/containers/podman && git clone https://github.com/opencontainers/runc && git clone https://github.com/containers/conmon WORKDIR /build/podman RUN git checkout $PODMAN_VERSION && patch Makefile /tmp/podman.Makefile.patch && make vendor local-cross && \ - cp ./bin/podman.cross.linux.arm64 /tmp/release/podman-$PODMAN_VERSION && chmod +x /podman-$PODMAN_VERSION + cp ./bin/podman.cross.linux.arm64 /tmp/release/podman-$PODMAN_VERSION && chmod +x /tmp/release/podman-$PODMAN_VERSION WORKDIR /build/runc RUN git checkout $RUNC_VERSION && patch Makefile /tmp/runc.Makefile.patch && make vendor localcross && \ - cp ./runc-arm64 /tmp/release/runc-$RUNC_VERSION && chmod +x /runc-$RUNC_VERSION + cp ./runc-arm64 /tmp/release/runc-$RUNC_VERSION && chmod +x /tmp/release/runc-$RUNC_VERSION WORKDIR /build/conmon -RUN git checkout $CONMON_VERSION && make vendor bin/conmon && cp bin/conmon /tmp/release/conmon-$CONMON_VERSION && chmod +x /conmon-$CONMON_VERSION +RUN git checkout $CONMON_VERSION && make vendor bin/conmon && cp bin/conmon /tmp/release/conmon-$CONMON_VERSION && chmod +x /tmp/release/conmon-$CONMON_VERSION RUN mkdir -p /tmp/install/usr/bin && mkdir -p /tmp/install/usr/libexec/podman/ && mkdir -p /tmp/install/usr/share/containers/ && mkdir -p /tmp/install/etc/containers/ COPY seccomp.json /tmp/install/usr/share/containers/ COPY containers.conf /tmp/install/etc/containers/ -RUN cp /podman-$PODMAN_VERSION /tmp/install/usr/bin/podman && cp /runc-$RUNC_VERSION /tmp/install/usr/bin/runc && cp /conmon-$CONMON_VERSION /tmp/install/usr/libexec/podman/conmon +RUN cp /tmp/release/podman-$PODMAN_VERSION /tmp/install/usr/bin/podman && cp /tmp/release/runc-$RUNC_VERSION /tmp/install/usr/bin/runc && cp /tmp/release/conmon-$CONMON_VERSION /tmp/install/usr/libexec/podman/conmon WORKDIR /tmp/install RUN zip -r /tmp/release/podman-install.zip *