Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Fedora 36 #48

Merged
merged 2 commits into from
Nov 24, 2023
Merged

Remove Fedora 36 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d3f332
Remove Fedora 36
s0undt3ch Nov 24, 2023
0956079
Switch to Fedora 38
s0undt3ch Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ will be commited.

### [![Fedora](https://github.com/saltstack/salt-ci-containers/actions/workflows/fedora-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/fedora-containers.yml)

- [dockerhub/fedora:36](https://hub.docker.com/r/_/fedora/tags?name=36) - `ghcr.io/saltstack/salt-ci-containers/fedora:36`
- [dockerhub/fedora:37](https://hub.docker.com/r/_/fedora/tags?name=37) - `ghcr.io/saltstack/salt-ci-containers/fedora:37`
- [dockerhub/fedora:38](https://hub.docker.com/r/_/fedora/tags?name=38) - `ghcr.io/saltstack/salt-ci-containers/fedora:38`
- [dockerhub/fedora:39](https://hub.docker.com/r/_/fedora/tags?name=39) - `ghcr.io/saltstack/salt-ci-containers/fedora:39`
Expand Down
1 change: 0 additions & 1 deletion containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ mirrors:
Fedora:
container: fedora
versions:
- "36"
- "37"
- "38"
- "39"
Expand Down
2 changes: 1 addition & 1 deletion custom/virt-minion/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if [[ -z "${HOST_UUID}" ]]; then
fi
echo "host_uuid = \"$HOST_UUID\"" >> /etc/libvirt/libvirtd.conf

env USE_STATIC_REQUIREMENTS=1 pip3 install -e /salt
env USE_STATIC_REQUIREMENTS=1 python${SALT_PY_VERSION} -m pip install -e /salt
/usr/sbin/sshd
virtlogd -d

Expand Down
26 changes: 17 additions & 9 deletions custom/virt-minion/latest.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
# Since 3006.x does not have Py3.11 linux requirements files, we need to stay on
# Fedora 36 so that we install Salt under Py3.10
FROM registry.fedoraproject.org/fedora:36
# Since 3006.x does not have Py3.11 linux requirements files, we need to stay on Py3.10
FROM registry.fedoraproject.org/fedora:38

ENV SALT_PY_VERSION=3.10
RUN dnf update -y && \
dnf install -y --setopt=tsflags=nodocs --setopt=install_weak_deps=False \
libvirt-devel \
libvirt-libs \
libvirt-daemon-driver-qemu \
libvirt-daemon-driver-storage-core \
libvirt-client \
Expand All @@ -25,14 +27,20 @@ RUN dnf update -y && \
rustc \
cargo \
libffi-devel \
python3 \
python3-devel \
python3-pip \
python3-psutil \
python3-libvirt && \
python${SALT_PY_VERSION} \
python${SALT_PY_VERSION}-libs \
python${SALT_PY_VERSION}-devel && \
dnf clean all

RUN env USE_STATIC_REQUIREMENTS=1 pip3 install --no-cache-dir salt
RUN dnf update -y && \
dnf install -y --setopt=tsflags=nodocs --setopt=install_weak_deps=False \
libvirt-devel libvirt-libs && \
dnf clean all

RUN python${SALT_PY_VERSION} -m ensurepip && \
python${SALT_PY_VERSION} -m pip install build wheel && \
python${SALT_PY_VERSION} -m pip install libvirt-python && \
env USE_STATIC_REQUIREMENTS=1 python${SALT_PY_VERSION} -m pip install --no-cache-dir salt

RUN echo 'listen_tls = 1' >> /etc/libvirt/libvirtd.conf; \
echo 'listen_tcp = 1' >> /etc/libvirt/libvirtd.conf; \
Expand Down
2 changes: 0 additions & 2 deletions mirrors/fedora/36.Dockerfile
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion mirrors/fedora/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# [![Fedora](https://github.com/saltstack/salt-ci-containers/actions/workflows/fedora-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/fedora-containers.yml)

- [dockerhub/fedora:36](https://hub.docker.com/r/_/fedora/tags?name=36) - `ghcr.io/saltstack/salt-ci-containers/fedora:36`
- [dockerhub/fedora:37](https://hub.docker.com/r/_/fedora/tags?name=37) - `ghcr.io/saltstack/salt-ci-containers/fedora:37`
- [dockerhub/fedora:38](https://hub.docker.com/r/_/fedora/tags?name=38) - `ghcr.io/saltstack/salt-ci-containers/fedora:38`
- [dockerhub/fedora:39](https://hub.docker.com/r/_/fedora/tags?name=39) - `ghcr.io/saltstack/salt-ci-containers/fedora:39`