diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 08768c83a4..98d161e054 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -21,7 +21,7 @@ jobs: build: name: "Build" runs-on: ubuntu-latest - container: registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel + container: quay.io/coreos-assembler/fcos-buildroot:testing-devel steps: - name: Checkout repository uses: actions/checkout@v3 @@ -43,7 +43,7 @@ jobs: name: "Build Integration Test Data" runs-on: ubuntu-latest container: - image: registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel + image: quay.io/coreos-assembler/fcos-buildroot:testing-devel # Run privileged to hack around createrepo_c hitting the classic seccomp # broken behaviour of returning EPERM instead of ENOSYS. We should be able # to drop this once `ubuntu-latest` is bumped to include the fix for @@ -65,7 +65,7 @@ jobs: cxx-verify: name: "Verify CXX generation" runs-on: ubuntu-latest - container: registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel + container: quay.io/coreos-assembler/fcos-buildroot:testing-devel steps: - name: Checkout repository uses: actions/checkout@v3 @@ -102,7 +102,7 @@ jobs: #build-clang: # name: "Build (clang)" # runs-on: ubuntu-latest - # container: registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel + # container: quay.io/coreos-assembler/fcos-buildroot:testing-devel # steps: # - name: Checkout repository # uses: actions/checkout@v3 diff --git a/Cargo.lock b/Cargo.lock index 4967d8e7f6..5ca4925cee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -225,7 +225,7 @@ dependencies = [ [[package]] name = "bootc-utils" version = "0.0.0" -source = "git+https://github.com/containers/bootc?rev=dc7d4cf320ec6d8b2470d1d5f76da66ec60b6810#dc7d4cf320ec6d8b2470d1d5f76da66ec60b6810" +source = "git+https://github.com/containers/bootc?rev=210f58b4a48b9627040e4df76f24530ee89e6bb5#210f58b4a48b9627040e4df76f24530ee89e6bb5" dependencies = [ "anyhow", "rustix", @@ -2188,7 +2188,7 @@ dependencies = [ [[package]] name = "ostree-ext" version = "0.15.3" -source = "git+https://github.com/containers/bootc?rev=dc7d4cf320ec6d8b2470d1d5f76da66ec60b6810#dc7d4cf320ec6d8b2470d1d5f76da66ec60b6810" +source = "git+https://github.com/containers/bootc?rev=210f58b4a48b9627040e4df76f24530ee89e6bb5#210f58b4a48b9627040e4df76f24530ee89e6bb5" dependencies = [ "anyhow", "bootc-utils", diff --git a/Cargo.toml b/Cargo.toml index 868281a622..b50882005c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -73,7 +73,7 @@ openssl = "0.10.68" once_cell = "1.20.2" os-release = "0.1.0" # We pull this one from git, as the project is no longer published as an external crate. -ostree-ext = { git = "https://github.com/containers/bootc", rev = "dc7d4cf320ec6d8b2470d1d5f76da66ec60b6810" } +ostree-ext = { git = "https://github.com/containers/bootc", rev = "210f58b4a48b9627040e4df76f24530ee89e6bb5" } paste = "1.0" phf = { version = "0.11", features = ["macros"] } rand = "0.8.5" diff --git a/ci/prow/Dockerfile b/ci/prow/Dockerfile index 24d659fdf4..8395da5574 100644 --- a/ci/prow/Dockerfile +++ b/ci/prow/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel as builder +FROM quay.io/coreos-assembler/fcos-buildroot:testing-devel as builder WORKDIR /src COPY . . RUN ./ci/coreosci-rpmbuild.sh && mkdir -p /cosa/component-rpms && mv rpm-ostree{,-libs}-20*.rpm /cosa/component-rpms