From 9f27ffbb68992253c171f00d23b1f3e826e96fb8 Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Thu, 12 Dec 2024 13:19:01 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=A4=96:=20Update=20build=20recipes=20?= =?UTF-8?q?from=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mariadb-image/Dockerfile | 8 ++++++-- mariadb-image/{gosu => idexec} | 0 2 files changed, 6 insertions(+), 2 deletions(-) rename mariadb-image/{gosu => idexec} (100%) diff --git a/mariadb-image/Dockerfile b/mariadb-image/Dockerfile index 5cda25e80..622377c5e 100644 --- a/mariadb-image/Dockerfile +++ b/mariadb-image/Dockerfile @@ -64,8 +64,12 @@ RUN set -euo pipefail; ln -s usr/local/bin/docker-entrypoint.sh / # backwards co COPY healthcheck.sh /usr/local/bin/ RUN set -euo pipefail; chmod 755 /usr/local/bin/healthcheck.sh -COPY gosu /usr/local/bin/gosu -RUN set -euo pipefail; chmod 755 /usr/local/bin/gosu +COPY idexec /usr/local/bin/idexec +RUN set -euo pipefail; chmod 755 /usr/local/bin/idexec + +# replace gosu calls with idexec +RUN set -euo pipefail; sed -i 's/exec gosu /exec idexec /g' /usr/local/bin/docker-entrypoint.sh +RUN set -euo pipefail; sed -i 's/exec gosu /exec idexec /g' /usr/local/bin/healthcheck.sh RUN set -euo pipefail; sed -i -e 's,$(pwgen .*),$(openssl rand -base64 36),' /usr/local/bin/docker-entrypoint.sh diff --git a/mariadb-image/gosu b/mariadb-image/idexec similarity index 100% rename from mariadb-image/gosu rename to mariadb-image/idexec From 00b4832b148ca779b13793c9451ebe0f233f8f01 Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Thu, 12 Dec 2024 18:21:16 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=A4=96:=20Update=20build=20recipes=20?= =?UTF-8?q?from=20templates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apache-tomcat-10-image/Dockerfile.openjdk17 | 15 +++++++++------ apache-tomcat-10-image/Dockerfile.openjdk21 | 15 +++++++++------ apache-tomcat-10-image/Dockerfile.openjdk23 | 15 +++++++++------ apache-tomcat-9-image/Dockerfile.openjdk17 | 15 +++++++++------ apache-tomcat-9-image/Dockerfile.openjdk21 | 15 +++++++++------ 5 files changed, 45 insertions(+), 30 deletions(-) diff --git a/apache-tomcat-10-image/Dockerfile.openjdk17 b/apache-tomcat-10-image/Dockerfile.openjdk17 index 89fee4e24..043d2425b 100644 --- a/apache-tomcat-10-image/Dockerfile.openjdk17 +++ b/apache-tomcat-10-image/Dockerfile.openjdk17 @@ -25,7 +25,7 @@ FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-17-openjdk java-17-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 java-17-openjdk java-17-openjdk-headless; \ zypper -n --installroot /target remove util-linux; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} @@ -58,11 +58,14 @@ CMD ["/usr/libexec/tomcat/server", "start"] EXPOSE 8080/tcp RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat -RUN set -euo pipefail; \ - sed -i /etc/tomcat/logging.properties \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler|' \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler|' \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/host-manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler|' +RUN set -euo pipefail; while IFS= read -r line; do \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler}; \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler}; \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/host-manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler}; \ + echo "$line" >> /tmp/logging.properties; \ +done < /usr/share/tomcat/conf/logging.properties; \ + +mv /tmp/logging.properties /usr/share/tomcat/conf/logging.properties WORKDIR $CATALINA_HOME USER tomcat diff --git a/apache-tomcat-10-image/Dockerfile.openjdk21 b/apache-tomcat-10-image/Dockerfile.openjdk21 index 51c193541..ad4917493 100644 --- a/apache-tomcat-10-image/Dockerfile.openjdk21 +++ b/apache-tomcat-10-image/Dockerfile.openjdk21 @@ -25,7 +25,7 @@ FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-21-openjdk java-21-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 java-21-openjdk java-21-openjdk-headless; \ zypper -n --installroot /target remove util-linux; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} @@ -58,11 +58,14 @@ CMD ["/usr/libexec/tomcat/server", "start"] EXPOSE 8080/tcp RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat -RUN set -euo pipefail; \ - sed -i /etc/tomcat/logging.properties \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler|' \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler|' \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/host-manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler|' +RUN set -euo pipefail; while IFS= read -r line; do \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler}; \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler}; \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/host-manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler}; \ + echo "$line" >> /tmp/logging.properties; \ +done < /usr/share/tomcat/conf/logging.properties; \ + +mv /tmp/logging.properties /usr/share/tomcat/conf/logging.properties WORKDIR $CATALINA_HOME USER tomcat diff --git a/apache-tomcat-10-image/Dockerfile.openjdk23 b/apache-tomcat-10-image/Dockerfile.openjdk23 index f618c9d6a..f899bc5ba 100644 --- a/apache-tomcat-10-image/Dockerfile.openjdk23 +++ b/apache-tomcat-10-image/Dockerfile.openjdk23 @@ -25,7 +25,7 @@ FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-23-openjdk java-23-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 java-23-openjdk java-23-openjdk-headless; \ zypper -n --installroot /target remove util-linux; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} @@ -58,11 +58,14 @@ CMD ["/usr/libexec/tomcat/server", "start"] EXPOSE 8080/tcp RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat -RUN set -euo pipefail; \ - sed -i /etc/tomcat/logging.properties \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler|' \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler|' \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/host-manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler|' +RUN set -euo pipefail; while IFS= read -r line; do \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler}; \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler}; \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/host-manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler}; \ + echo "$line" >> /tmp/logging.properties; \ +done < /usr/share/tomcat/conf/logging.properties; \ + +mv /tmp/logging.properties /usr/share/tomcat/conf/logging.properties WORKDIR $CATALINA_HOME USER tomcat diff --git a/apache-tomcat-9-image/Dockerfile.openjdk17 b/apache-tomcat-9-image/Dockerfile.openjdk17 index 7c28e706c..114875723 100644 --- a/apache-tomcat-9-image/Dockerfile.openjdk17 +++ b/apache-tomcat-9-image/Dockerfile.openjdk17 @@ -25,7 +25,7 @@ FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat curl sed java-17-openjdk java-17-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat java-17-openjdk java-17-openjdk-headless; \ zypper -n --installroot /target remove util-linux; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} @@ -58,11 +58,14 @@ CMD ["/usr/libexec/tomcat/server", "start"] EXPOSE 8080/tcp RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat -RUN set -euo pipefail; \ - sed -i /etc/tomcat/logging.properties \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler|' \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler|' \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/host-manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler|' +RUN set -euo pipefail; while IFS= read -r line; do \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler}; \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler}; \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/host-manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler}; \ + echo "$line" >> /tmp/logging.properties; \ +done < /usr/share/tomcat/conf/logging.properties; \ + +mv /tmp/logging.properties /usr/share/tomcat/conf/logging.properties WORKDIR $CATALINA_HOME USER tomcat diff --git a/apache-tomcat-9-image/Dockerfile.openjdk21 b/apache-tomcat-9-image/Dockerfile.openjdk21 index bcc3f0df4..f79e07996 100644 --- a/apache-tomcat-9-image/Dockerfile.openjdk21 +++ b/apache-tomcat-9-image/Dockerfile.openjdk21 @@ -25,7 +25,7 @@ FROM opensuse/tumbleweed:latest AS builder COPY --from=target / /target RUN set -euo pipefail; \ - zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat curl sed java-21-openjdk java-21-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat java-21-openjdk java-21-openjdk-headless; \ zypper -n --installroot /target remove util-linux; \ zypper -n clean; \ rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2} @@ -58,11 +58,14 @@ CMD ["/usr/libexec/tomcat/server", "start"] EXPOSE 8080/tcp RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat -RUN set -euo pipefail; \ - sed -i /etc/tomcat/logging.properties \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler|' \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler|' \ - -e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/host-manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler|' +RUN set -euo pipefail; while IFS= read -r line; do \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler}; \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler}; \ + line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/host-manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler}; \ + echo "$line" >> /tmp/logging.properties; \ +done < /usr/share/tomcat/conf/logging.properties; \ + +mv /tmp/logging.properties /usr/share/tomcat/conf/logging.properties WORKDIR $CATALINA_HOME USER tomcat From 34f6c2509220760cfe376c7821314ecb37543bc5 Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Thu, 12 Dec 2024 18:21:50 +0000 Subject: [PATCH 3/3] Update changelogs for apache-tomcat-10-image, apache-tomcat-9-image, mariadb-image --- apache-tomcat-10-image/apache-tomcat-10-image.changes | 5 +++++ apache-tomcat-9-image/apache-tomcat-9-image.changes | 5 +++++ mariadb-image/mariadb-image.changes | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/apache-tomcat-10-image/apache-tomcat-10-image.changes b/apache-tomcat-10-image/apache-tomcat-10-image.changes index 50029962c..566185036 100644 --- a/apache-tomcat-10-image/apache-tomcat-10-image.changes +++ b/apache-tomcat-10-image/apache-tomcat-10-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 12 18:25:14 UTC 2024 - Dirk Müller + +- remove curl and sed from the image + ------------------------------------------------------------------- Tue Dec 3 13:26:37 UTC 2024 - SUSE Update Bot diff --git a/apache-tomcat-9-image/apache-tomcat-9-image.changes b/apache-tomcat-9-image/apache-tomcat-9-image.changes index 88a1cee83..45a107542 100644 --- a/apache-tomcat-9-image/apache-tomcat-9-image.changes +++ b/apache-tomcat-9-image/apache-tomcat-9-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 12 18:25:14 UTC 2024 - Dirk Müller + +- remove curl and sed from the image + ------------------------------------------------------------------- Tue Dec 3 13:26:37 UTC 2024 - SUSE Update Bot diff --git a/mariadb-image/mariadb-image.changes b/mariadb-image/mariadb-image.changes index 1f8e04c20..f5f3c7f67 100644 --- a/mariadb-image/mariadb-image.changes +++ b/mariadb-image/mariadb-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 12 18:21:50 UTC 2024 - SUSE Update Bot + +- rename gosu binary + ------------------------------------------------------------------- Tue Dec 3 13:26:37 UTC 2024 - SUSE Update Bot