From 9d9eee012868e94bfb946380f9133c70cd9d32e2 Mon Sep 17 00:00:00 2001 From: aleskandro Date: Sun, 16 Oct 2022 09:53:49 +0200 Subject: [PATCH] Temporary fix to get the rpms in the correct folder in both prow ci and the okd-payload-pipeline Refers okd-project/okd-payload-pipeline#15 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c00fb7eb..d0b732a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG FEDORA_COREOS_VERSION=412.37.0 WORKDIR /go/src/github.com/openshift/okd-machine-os COPY . . -COPY --from=artifacts /srv/repo/*.rpm /tmp/rpms/ +COPY --from=artifacts /srv/repo/ /tmp/rpms/ ADD overrides.yaml /etc/rpm-ostree/origin.d/overrides.yaml RUN cat /etc/os-release \ && rpm-ostree --version \ @@ -27,6 +27,7 @@ RUN cat /etc/os-release \ && ln -s /usr/sbin/ovs-vswitchd.dpdk /usr/sbin/ovs-vswitchd \ && rm -rf /go /tmp/rpms /var/cache /var/lib/unbound \ && ostree container commit + LABEL io.openshift.release.operator=true \ io.openshift.build.version-display-names="machine-os=Fedora CoreOS" \ io.openshift.build.versions="machine-os=${FEDORA_COREOS_VERSION}"