Skip to content

Commit

Permalink
Merge pull request #660 from vrutkovs/4.14-sep22
Browse files Browse the repository at this point in the history
[release-4.14] Dockerfile: switch to FCOS Stable
  • Loading branch information
openshift-merge-robot committed Sep 23, 2023
2 parents 870f7a3 + 7f82fec commit 446fa3b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.ci.openshift.org/origin/4.14:artifacts as artifacts

FROM quay.io/fedora/fedora-coreos:testing-devel
FROM quay.io/fedora/fedora-coreos:stable
ARG FEDORA_COREOS_VERSION=414.38.0

WORKDIR /go/src/github.com/openshift/okd-machine-os
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Label okd-machine-os image with Fedora CoreOS version extracted from /etc/release
FROM quay.io/fedora/fedora-coreos:testing-devel
FROM quay.io/fedora/fedora-coreos:stable
COPY . /go/src/github.com/openshift/okd-machine-os
WORKDIR /go/src/github.com/openshift/okd-machine-os
RUN source /etc/os-release \
Expand Down
2 changes: 1 addition & 1 deletion fedora-coreos-config
Submodule fedora-coreos-config updated 28 files
+6 −0 image.yaml
+33 −20 kola-denylist.yaml
+15 −15 manifest-lock.aarch64.json
+24 −0 manifest-lock.overrides.yaml
+16 −16 manifest-lock.ppc64le.json
+38 −11 manifest-lock.s390x.json
+16 −16 manifest-lock.x86_64.json
+2 −10 manifest.yaml
+2 −6 manifests/bootable-rpm-ostree.yaml
+1 −0 manifests/fedora-coreos-base.yaml
+2 −2 overlay.d/05core/usr/lib/coreos/generator-lib.sh
+1 −1 overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-boot-edit.sh
+1 −1 overlay.d/05core/usr/lib/dracut/modules.d/35coreos-ignition/coreos-diskful-generator
+14 −7 overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-transposefs.sh
+1 −1 overlay.d/05core/usr/libexec/coreos-ignition-delete-config
+1 −1 overlay.d/20platform-chrony/usr/libexec/coreos-platform-chrony-config
+8 −0 overlay.d/30lvmdevices/etc/lvm/devices/system.devices
+2 −0 overlay.d/30lvmdevices/statoverride
+1 −0 overlay.d/30lvmdevices/usr/lib/systemd/system-preset/45-coreos-populate-lvmdevices.preset
+25 −0 overlay.d/30lvmdevices/usr/lib/systemd/system/coreos-populate-lvmdevices.service
+46 −0 overlay.d/30lvmdevices/usr/libexec/coreos-populate-lvmdevices
+15 −1 overlay.d/README.md
+13 −10 tests/kola/data/commonlib.sh
+65 −0 tests/kola/disks/lvmdevices
+2 −0 tests/kola/files/fwupd-refresh-timer
+1 −0 tests/kola/files/logrotate-service
+8 −4 tests/kola/root-reprovision/autosave-xfs/test.sh
+5 −3 tests/kola/root-reprovision/luks/autosave-xfs/test.sh

0 comments on commit 446fa3b

Please sign in to comment.