Merge pull request #349 from cgwalters/dev-c9s

ci: Target c9s in more places

.github/workflows/ci.yml

@@ -118,23 +118,23 @@ jobs:
         run: bootc internal-tests run-container-integration
   privtest-alongside:
     name: "Test install-alongside"
-    needs: [build-fedora]
+    needs: [build-c9s]
     runs-on: ubuntu-latest
     steps:
       - name: Ensure host skopeo is disabled
         run: sudo rm -f /bin/skopeo /usr/bin/skopeo
       - name: Download
         uses: actions/download-artifact@v3
         with:
-          name: bootc.tar.zst
+          name: bootc-c9s.tar.zst
       - name: Install
         run: tar -xvf bootc.tar.zst
       - name: Integration tests
         run: |
           set -xeuo pipefail
           echo 'ssh-ed25519 ABC0123 [email protected]' > test_authorized_keys
           sudo podman run --rm -ti --privileged -v ./test_authorized_keys:/test_authorized_keys --env RUST_LOG=debug -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \
-            quay.io/centos-bootc/fedora-bootc-dev:eln bootc install to-filesystem \
+            quay.io/centos-bootc/centos-bootc-dev:stream9 bootc install to-filesystem \
             --karg=foo=bar --disable-selinux --replace=alongside --root-ssh-authorized-keys=/test_authorized_keys /target
           ls -al /boot/loader/
           sudo grep foo=bar /boot/loader/entries/*.conf
@@ -143,6 +143,6 @@ jobs:
           sudo chattr -i /ostree/deploy/default/deploy/*
           sudo rm /ostree/deploy/default -rf
           sudo podman run --rm -ti --privileged --env BOOTC_SKIP_SELINUX_HOST_CHECK=1 --env RUST_LOG=debug -v /:/target -v /var/lib/containers:/var/lib/containers -v ./usr/bin/bootc:/usr/bin/bootc --pid=host --security-opt label=disable \
-            quay.io/centos-bootc/fedora-bootc-dev:eln bootc install to-filesystem \
+            quay.io/centos-bootc/centos-bootc-dev:stream9 bootc install to-filesystem \
             --replace=alongside /target
           sudo ls -ldZ / /ostree/deploy/default/deploy/* /ostree/deploy/default/deploy/*/etc

hack/Containerfile

@@ -1,15 +1,15 @@
 # This container build is just a demo effectively; it shows how one might
 # build bootc in a container flow, using Fedora ELN as the target.
-FROM quay.io/centos-bootc/fedora-bootc:eln as build
-RUN dnf config-manager --set-enabled eln-crb && dnf -y install cargo ostree-devel openssl-devel && dnf clean all
+FROM quay.io/centos-bootc/centos-bootc:stream9 as build
+RUN dnf config-manager --set-enabled crb && dnf -y install cargo ostree-devel openssl-devel && dnf clean all
 COPY . /build
 WORKDIR /build
 RUN mkdir -p /build/target/dev-rootfs  # This can hold arbitrary extra content
 # See https://www.reddit.com/r/rust/comments/126xeyx/exploring_the_problem_of_faster_cargo_docker/
 # We aren't using the full recommendations there, just the simple bits.
 RUN --mount=type=cache,target=/build/target --mount=type=cache,target=/var/roothome make bin-archive && mkdir -p /out && cp target/bootc.tar.zst /out
 
-FROM quay.io/centos-bootc/fedora-bootc:eln
+FROM quay.io/centos-bootc/centos-bootc:stream9
 COPY --from=build /out/bootc.tar.zst /tmp
 COPY --from=build /build/target/dev-rootfs/ /
 RUN tar -C / --zstd -xvf /tmp/bootc.tar.zst && rm -vf /tmp/*