diff --git a/src/Dockerfile.client b/src/Dockerfile.client index af75829..cf54b82 100644 --- a/src/Dockerfile.client +++ b/src/Dockerfile.client @@ -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/ diff --git a/src/Dockerfile.django-pip b/src/Dockerfile.django-pip index 94f7d2e..1b869df 100644 --- a/src/Dockerfile.django-pip +++ b/src/Dockerfile.django-pip @@ -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 \ diff --git a/src/Dockerfile.idp b/src/Dockerfile.idp index a393ece..ecdb1db 100644 --- a/src/Dockerfile.idp +++ b/src/Dockerfile.idp @@ -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/ diff --git a/src/Dockerfile.ipa b/src/Dockerfile.ipa index 56bb6fc..abba730 100644 --- a/src/Dockerfile.ipa +++ b/src/Dockerfile.ipa @@ -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 \ diff --git a/src/Dockerfile.www b/src/Dockerfile.www index 4a0f21e..c4bfcdb 100644 --- a/src/Dockerfile.www +++ b/src/Dockerfile.www @@ -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/ diff --git a/src/Dockerfile.www-with-app b/src/Dockerfile.www-with-app index a18f665..b45bfb2 100644 --- a/src/Dockerfile.www-with-app +++ b/src/Dockerfile.www-with-app @@ -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/ diff --git a/src/www-mod_wsgi-gssapi.conf b/src/www-mod_wsgi-gssapi.conf index 9c18b0e..1d0ef78 100644 --- a/src/www-mod_wsgi-gssapi.conf +++ b/src/www-mod_wsgi-gssapi.conf @@ -11,7 +11,7 @@ # 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 @@ -19,8 +19,8 @@ Require all granted -Alias /static/ /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/ + Require all granted diff --git a/src/www-mod_wsgi-openidc.conf b/src/www-mod_wsgi-openidc.conf index 67a40cf..9ca2e15 100644 --- a/src/www-mod_wsgi-openidc.conf +++ b/src/www-mod_wsgi-openidc.conf @@ -10,7 +10,7 @@ # 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 @@ -18,8 +18,8 @@ Require all granted -Alias /static/ /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/ + Require all granted diff --git a/src/www-mod_wsgi-saml.conf b/src/www-mod_wsgi-saml.conf index 9662738..d2578e1 100644 --- a/src/www-mod_wsgi-saml.conf +++ b/src/www-mod_wsgi-saml.conf @@ -10,7 +10,7 @@ # 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 @@ -18,8 +18,8 @@ Require all granted -Alias /static/ /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/ + Require all granted