Add skopeo and umoci to CI image

Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
openshift · May 23, 2024 · b9a2d50 · b9a2d50
1 parent 14cb21b
commit b9a2d50
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,13 +9,18 @@ RUN make
 
 FROM registry.ci.openshift.org/ocp/4.14:base-rhel9
 ARG OC_VERSION=latest
-RUN dnf -y update && dnf install -y binutils file go podman runc jq && dnf clean all
+ARG UMOCI_VERSION=latest
+
+RUN dnf -y update && dnf install -y binutils file go podman runc jq skopeo && dnf clean all
 RUN wget -O "openshift-client-linux-${OC_VERSION}.tar.gz" "https://mirror.openshift.com/pub/openshift-v4/amd64/clients/ocp/${OC_VERSION}/openshift-client-linux.tar.gz" \
   && tar -C /usr/local/bin -xzvf "openshift-client-linux-$OC_VERSION.tar.gz" oc
 RUN curl --fail --retry 3 -LJO https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest-4.14/opm-linux.tar.gz && \
     tar -xzf opm-linux.tar.gz && \
     mv ./opm /usr/local/bin/ && \
     rm -f opm-linux.tar.gz
+RUN wget -O /usr/local/bin/umoci "https://github.com/opencontainers/umoci/releases/$UMOCI_VERSION/download/umoci.amd64" && \
+    chmod +x /usr/local/bin/umoci
+
 COPY --from=builder /app/check-payload /check-payload
 
 ENTRYPOINT ["/check-payload"]

diff --git a/Dockerfile.upstream b/Dockerfile.upstream
@@ -9,14 +9,18 @@ RUN make
 
 FROM fedora:38
 ARG OC_VERSION=latest
+ARG UMOCI_VERSION=latest
 
 RUN curl -LJo "openshift-client-linux-${OC_VERSION}.tar.gz" "https://mirror.openshift.com/pub/openshift-v4/amd64/clients/ocp/${OC_VERSION}/openshift-client-linux.tar.gz" \
   && tar -C /usr/local/bin -xzvf "openshift-client-linux-$OC_VERSION.tar.gz" oc
-RUN dnf -y update && dnf install -y binutils go file runc podman jq && dnf clean all
+RUN dnf -y update && dnf install -y binutils go file runc podman jq skopeo && dnf clean all
 RUN curl --fail --retry 3 -LJO https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/latest-4.14/opm-linux.tar.gz && \
     tar -xzf opm-linux.tar.gz && \
     mv ./opm /usr/local/bin/ && \
     rm -f opm-linux.tar.gz
+RUN wget -O /usr/local/bin/umoci "https://github.com/opencontainers/umoci/releases/download/$UMOCI_VERSION/umoci.amd64" && \
+    chmod +x /usr/local/bin/umoci
+
 COPY --from=builder /app/check-payload /check-payload
 
 ENTRYPOINT ["/check-payload"]