Skip to content

Commit

Permalink
Temporary fix to get the rpms in the correct folder in both prow ci a…
Browse files Browse the repository at this point in the history
…nd the okd-payload-pipeline

Refers okd-project/okd-payload-pipeline#15
  • Loading branch information
aleskandro authored and vrutkovs committed Nov 9, 2022
1 parent 8203c4d commit 70dc50f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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}"

0 comments on commit 70dc50f

Please sign in to comment.