Skip to content

Commit

Permalink
Upgrade to Fedora 41.
Browse files Browse the repository at this point in the history
  • Loading branch information
adelton committed Dec 11, 2024
1 parent 64b5ce4 commit de8c84c
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions src/Dockerfile.client
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM registry.fedoraproject.org/fedora:40
RUN dnf install -y /usr/sbin/ipa-client-install openssh-server xauth firefox dejavu-sans-fonts dejavu-sans-mono-fonts /usr/bin/xargs python3-xvfbwrapper python3-selenium xorg-x11-server-Xvfb && dnf clean all
FROM registry.fedoraproject.org/fedora:41
RUN dnf install -y /usr/sbin/ipa-client-install openssh-server xauth firefox dejavu-sans-fonts dejavu-sans-mono-fonts /usr/bin/xargs python3-xvfbwrapper python3-selenium python3-legacy-cgi xorg-x11-server-Xvfb && dnf clean all
RUN curl -LO https://github.com/mozilla/geckodriver/releases/download/v0.34.0/geckodriver-v0.34.0-linux64.tar.gz
RUN tar xvzf geckodriver-v0.34.0-linux64.tar.gz && mv geckodriver /usr/local/bin/
COPY init-data ipa-client-enroll populate-data-volume setup-authorized-keys /usr/sbin/
Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfile.django-pip
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:40
FROM registry.fedoraproject.org/fedora:41
RUN dnf install -y python3-virtualenv patch /usr/bin/systemd-tmpfiles && dnf clean all
RUN mkdir -p /var/www/django
RUN cd /var/www/django \
Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfile.idp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:40
FROM registry.fedoraproject.org/fedora:41
RUN dnf install -y /usr/sbin/ipa-client-install /usr/sbin/ipsilon-server-install ipsilon-authform ipsilon-saml2 ipsilon-openidc ipsilon-infosssd sqlite openssl && dnf clean all
COPY init-data ipa-client-enroll ipsilon-server-configure ipsilon-server-wait-for-sp populate-data-volume /usr/sbin/
COPY ipa-client-enroll.service ipsilon-server-configure.service ipsilon-server-wait-for-sp.service populate-data-volume.service /usr/lib/systemd/system/
Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfile.ipa
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM freeipa/freeipa-server:fedora-40
FROM freeipa/freeipa-server:fedora-41
COPY init-ipa-server-install-options ipa-precreate-hosts /usr/sbin/
COPY ipa-precreate-hosts.service /usr/lib/systemd/system/
RUN mkdir /usr/lib/systemd/system/container-ipa.target.wants \
Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfile.www
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:40
FROM registry.fedoraproject.org/fedora:41
RUN dnf install -y /usr/sbin/ipa-client-install /usr/bin/ipsilon-client-install ipsilon-saml2 httpd mod_ssl mod_auth_gssapi mod_auth_openidc mod_intercept_form_submit mod_lookup_identity sssd-dbus /usr/bin/xargs openssl && dnf clean all
COPY init-data ipa-client-enroll ipsilon-client-configure populate-data-volume www-setup-apache /usr/sbin/
COPY ipa-client-enroll.service ipsilon-client-configure.service populate-data-volume.service www-setup-apache.service /usr/lib/systemd/system/
Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfile.www-with-app
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.fedoraproject.org/fedora:40
FROM registry.fedoraproject.org/fedora:41
RUN dnf install -y /usr/sbin/ipa-client-install /usr/bin/ipsilon-client-install ipsilon-saml2 httpd mod_ssl mod_auth_gssapi mod_intercept_form_submit mod_lookup_identity sssd-dbus /usr/bin/xargs /usr/bin/systemd-tmpfiles openssl && dnf clean all
COPY init-data ipa-client-enroll ipsilon-client-configure populate-data-volume www-setup-apache /usr/sbin/
COPY ipa-client-enroll.service ipsilon-client-configure.service populate-data-volume.service www-setup-apache.service /usr/lib/systemd/system/
Expand Down
6 changes: 3 additions & 3 deletions src/www-mod_wsgi-gssapi.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
# docker exec -ti webauthinfra_www_1 systemctl restart httpd

WSGIScriptAlias / /var/www/django/project/project/wsgi.py
WSGIPythonPath /var/www/django/project:/var/www/django/lib/python3.12/site-packages
WSGIPythonPath /var/www/django/project:/var/www/django/lib/python3.13/site-packages

<Directory /var/www/django>
<Files wsgi.py>
Require all granted
</Files>
</Directory>

Alias /static/ /var/www/django/lib/python3.12/site-packages/django/contrib/admin/static/
<Directory /var/www/django/lib/python3.12/site-packages/django/contrib/admin/static/>
Alias /static/ /var/www/django/lib/python3.13/site-packages/django/contrib/admin/static/
<Directory /var/www/django/lib/python3.13/site-packages/django/contrib/admin/static/>
Require all granted
</Directory>

Expand Down
6 changes: 3 additions & 3 deletions src/www-mod_wsgi-openidc.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
# docker exec -ti webauthinfra_www_1 systemctl restart httpd

WSGIScriptAlias / /var/www/django/project/project/wsgi.py
WSGIPythonPath /var/www/django/project:/var/www/django/lib/python3.12/site-packages
WSGIPythonPath /var/www/django/project:/var/www/django/lib/python3.13/site-packages

<Directory /var/www/django>
<Files wsgi.py>
Require all granted
</Files>
</Directory>

Alias /static/ /var/www/django/lib/python3.12/site-packages/django/contrib/admin/static/
<Directory /var/www/django/lib/python3.12/site-packages/django/contrib/admin/static/>
Alias /static/ /var/www/django/lib/python3.13/site-packages/django/contrib/admin/static/
<Directory /var/www/django/lib/python3.13/site-packages/django/contrib/admin/static/>
Require all granted
</Directory>

Expand Down
6 changes: 3 additions & 3 deletions src/www-mod_wsgi-saml.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
# docker exec -ti webauthinfra_www_1 systemctl restart httpd

WSGIScriptAlias / /var/www/django/project/project/wsgi.py
WSGIPythonPath /var/www/django/project:/var/www/django/lib/python3.12/site-packages
WSGIPythonPath /var/www/django/project:/var/www/django/lib/python3.13/site-packages

<Directory /var/www/django>
<Files wsgi.py>
Require all granted
</Files>
</Directory>

Alias /static/ /var/www/django/lib/python3.12/site-packages/django/contrib/admin/static/
<Directory /var/www/django/lib/python3.12/site-packages/django/contrib/admin/static/>
Alias /static/ /var/www/django/lib/python3.13/site-packages/django/contrib/admin/static/
<Directory /var/www/django/lib/python3.13/site-packages/django/contrib/admin/static/>
Require all granted
</Directory>

Expand Down

0 comments on commit de8c84c

Please sign in to comment.