From 0d4b472b3e53c2f559d2f8ffd514bc1afe8d7147 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 15 Jul 2024 09:40:30 +0200 Subject: [PATCH] refs #7721 Images deleted/updated --- freeradius/Dockerfile | 13 ------------- freeradius/default.patch | 24 ------------------------ freeradius/eap | 20 -------------------- freeradius/inner-tunnel.patch | 24 ------------------------ httpd/Dockerfile | 2 +- jenkins-agent/Dockerfile | 2 +- phpmyadmin/Dockerfile | 4 ---- phpmyadmin/style.css | 10 ---------- redmine/Dockerfile | 2 +- 9 files changed, 3 insertions(+), 98 deletions(-) delete mode 100644 freeradius/Dockerfile delete mode 100644 freeradius/default.patch delete mode 100644 freeradius/eap delete mode 100644 freeradius/inner-tunnel.patch delete mode 100644 phpmyadmin/Dockerfile delete mode 100644 phpmyadmin/style.css diff --git a/freeradius/Dockerfile b/freeradius/Dockerfile deleted file mode 100644 index faa1a68..0000000 --- a/freeradius/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM freeradius/freeradius-server:3.0.20 - -RUN apt-get update \ - && apt-get install -y patch \ - && rm -rf /var/lib/apt/lists/* - -COPY default.patch inner-tunnel.patch ./ - -RUN echo "Patching site config files to use LDAP module" \ - && patch /etc/raddb/sites-available/default default.patch \ - && patch /etc/raddb/sites-available/inner-tunnel inner-tunnel.patch - -COPY eap /etc/raddb/mods-enabled/ diff --git a/freeradius/default.patch b/freeradius/default.patch deleted file mode 100644 index 027787b..0000000 --- a/freeradius/default.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- default 2019-11-14 17:00:00.000000000 +0000 -+++ default.local 2020-04-16 11:02:21.483549795 +0000 -@@ -419,7 +419,7 @@ - - # - # The ldap module reads passwords from the LDAP database. -- -ldap -+ ldap - - # - # Enforce daily limits on time spent logged in. -@@ -530,9 +530,9 @@ - # authentication server, and knows what to do with authentication. - # LDAP servers do not. - # --# Auth-Type LDAP { --# ldap --# } -+ Auth-Type LDAP { -+ ldap -+ } - - # - # Allow EAP authentication. diff --git a/freeradius/eap b/freeradius/eap deleted file mode 100644 index 60cee49..0000000 --- a/freeradius/eap +++ /dev/null @@ -1,20 +0,0 @@ - -eap { - default_eap_type = ttls - - gtc { - auth_type = PAP - } - tls-config tls-common { - private_key_file = ${certdir}/server.pem - certificate_file = ${certdir}/server.pem - ca_file = ${cadir}/ca.pem - tls_min_version = "1.2" - } - ttls { - tls = tls-common - default_eap_type = gtc - use_tunneled_reply = yes - virtual_server = "inner-tunnel" - } -} diff --git a/freeradius/inner-tunnel.patch b/freeradius/inner-tunnel.patch deleted file mode 100644 index 7b9028e..0000000 --- a/freeradius/inner-tunnel.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- inner-tunnel 2019-11-14 17:00:00.000000000 +0000 -+++ inner-tunnel.local 2020-04-16 10:59:58.519556165 +0000 -@@ -151,7 +151,7 @@ - - # - # The ldap module reads passwords from the LDAP database. -- -ldap -+ ldap - - # - # Enforce daily limits on time spent logged in. -@@ -238,9 +238,9 @@ - # authentication server, and knows what to do with authentication. - # LDAP servers do not. - # --# Auth-Type LDAP { --# ldap --# } -+ Auth-Type LDAP { -+ ldap -+ } - - # - # Allow EAP authentication. diff --git a/httpd/Dockerfile b/httpd/Dockerfile index 3689004..432bf20 100644 --- a/httpd/Dockerfile +++ b/httpd/Dockerfile @@ -1,3 +1,3 @@ -FROM httpd:2.4.58 +FROM httpd:2.4.61 RUN echo "IncludeOptional conf.d/*.conf" >> conf/httpd.conf diff --git a/jenkins-agent/Dockerfile b/jenkins-agent/Dockerfile index 0689712..85aca1f 100644 --- a/jenkins-agent/Dockerfile +++ b/jenkins-agent/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get install -y apt-transport-https ca-certificates curl gnupg \ COPY --from=docker:26.1.3-cli /usr/local/bin/docker /usr/local/bin/ # Docker compose -RUN apt-get install docker-compose -y --no-install-recommends # Debian docker-compose is 1.29.2 +RUN apt-get install docker-compose -y --no-install-recommends # Puppeteer RUN apt-get install -y --no-install-recommends \ diff --git a/phpmyadmin/Dockerfile b/phpmyadmin/Dockerfile deleted file mode 100644 index 4c4775d..0000000 --- a/phpmyadmin/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM phpmyadmin/phpmyadmin:5.0.1 - -COPY style.css /etc/phpmyadmin/ -RUN cat /etc/phpmyadmin/style.css >> /usr/src/phpmyadmin/themes/metro/css/theme.css diff --git a/phpmyadmin/style.css b/phpmyadmin/style.css deleted file mode 100644 index 58632e6..0000000 --- a/phpmyadmin/style.css +++ /dev/null @@ -1,10 +0,0 @@ -body { - font-size: 10pt !important; -} -.CodeMirror { - font-size: 13px; -} -body .ui-dialog { - top: 40px !important; - width: 1000px !important; -} diff --git a/redmine/Dockerfile b/redmine/Dockerfile index 5c8eb43..4caeb82 100644 --- a/redmine/Dockerfile +++ b/redmine/Dockerfile @@ -1,4 +1,4 @@ -FROM redmine:5.1.2 +FROM redmine:5.1.3-bookworm ENV REDMINE_PATH=/usr/src/redmine \ REDMINE_LOCAL_PATH=/var/local/redmine