feat: bump testing to Fedora 45 (#2887)
* feat: bump testing to Fedora 45 We are using docker from their repo because it usually ships newer versions faster than Fedora. In the meantime we can just ship Fedora's docker version which is good enough. xref: https://github.com/ublue-os/aurora/issues/2758 * renovate * fix: cleanup hidden files in /tmp Something specific to the DX build creates a bunch of socket files (/tmp/.{ICE,X11,XIM,font}-unix) now. I have no idea what it is, it is not the new docker package.
This commit is contained in:
parent
6ce2bb1d9a
commit
70d98ffa53
5 changed files with 31 additions and 15 deletions
2
Justfile
2
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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
# 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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue