diff --git a/Justfile b/Justfile index cf8c4f10..b0140e2b 100644 --- a/Justfile +++ b/Justfile @@ -5,7 +5,7 @@ export base_image_name := env("BASE_IMAGE_NAME", "kinoite") stable_version := "44" latest_version := "44" -testing_version := "44" +testing_version := "45" images := '( [aurora]=aurora diff --git a/build_scripts/dx/00-dx.sh b/build_scripts/dx/00-dx.sh index a5553724..72faad93 100755 --- a/build_scripts/dx/00-dx.sh +++ b/build_scripts/dx/00-dx.sh @@ -64,13 +64,28 @@ fi echo "Installing ${#FEDORA_PACKAGES[@]} DX packages from Fedora repos..." dnf5 -y install "${FEDORA_PACKAGES[@]}" -# Docker packages from their repo -dnf -y install --from-repo=docker-ce-stable \ - containerd.io \ - docker-buildx-plugin \ - docker-ce \ - docker-ce-cli \ - docker-compose-plugin +# docker is not available for f45 yet +# https://github.com/docker/docker-ce-packaging/issues/1353 +# TODO: get it from docker again once it's available +if [[ $(rpm -E %fedora) == "44" ]]; then + # Docker packages from their repo + dnf -y install --from-repo=docker-ce-stable \ + containerd.io \ + docker-buildx-plugin \ + docker-ce \ + docker-ce-cli \ + docker-compose-plugin +else + # we get this from common, the fedora package provides the exact same one + rm -f /usr/lib/sysusers.d/docker.conf + + dnf -y install \ + containerd \ + docker-buildx \ + moby-engine \ + docker-cli \ + docker-compose +fi # VSCode package from Microsoft repo dnf -y install --from-repo=code \ diff --git a/build_scripts/dx/10-tests-dx.sh b/build_scripts/dx/10-tests-dx.sh index 8d4a9e0c..0436fe58 100755 --- a/build_scripts/dx/10-tests-dx.sh +++ b/build_scripts/dx/10-tests-dx.sh @@ -6,10 +6,11 @@ set -eoux pipefail IMPORTANT_PACKAGES_DX=( code - containerd.io - docker-ce - docker-buildx-plugin - docker-compose-plugin + # containerd.io + containerd + # docker-ce + # docker-buildx-plugin + # docker-compose-plugin flatpak-builder libvirt qemu diff --git a/build_scripts/shared/clean-stage.sh b/build_scripts/shared/clean-stage.sh index 5e763101..e83ff928 100755 --- a/build_scripts/shared/clean-stage.sh +++ b/build_scripts/shared/clean-stage.sh @@ -41,7 +41,7 @@ find /run -mindepth 1 \ ! -path '/run/.containerenv' \ -delete -rm -rf /tmp/* +rm -rf /tmp/* /tmp/.* mkdir -p /var/tmp # Needs to be here to make the main image build strict (no /opt there) diff --git a/image-versions.yml b/image-versions.yml index 1340ff62..70a69814 100644 --- a/image-versions.yml +++ b/image-versions.yml @@ -2,8 +2,8 @@ images: # https://gitlab.com/fedora/ostree/ci-test - name: kinoite image: quay.io/fedora-ostree-desktops/kinoite - tag: 44 - digest: sha256:632e2de07d989da417171f2ca472ba0507bc34dfb061004a653fbc8c9f4fe1db + tag: 45 + digest: sha256:a411e1c50d9845feb1a831556ea33f04bf43e9eec6417c2038b325330024e041 # https://github.com/get-aurora-dev/common - name: common