From eab64ad035af03f5d744823c8235832d5924b3a9 Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Thu, 12 Dec 2024 13:18:44 +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 --- rmt-mariadb-image/Dockerfile | 8 ++++++-- rmt-mariadb-image/{gosu => idexec} | 0 2 files changed, 6 insertions(+), 2 deletions(-) rename rmt-mariadb-image/{gosu => idexec} (100%) diff --git a/rmt-mariadb-image/Dockerfile b/rmt-mariadb-image/Dockerfile index 73245b204..4ab48aabd 100644 --- a/rmt-mariadb-image/Dockerfile +++ b/rmt-mariadb-image/Dockerfile @@ -75,8 +75,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/rmt-mariadb-image/gosu b/rmt-mariadb-image/idexec similarity index 100% rename from rmt-mariadb-image/gosu rename to rmt-mariadb-image/idexec From 85acb9336219842ad50c1445909b7f3af11cda16 Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Thu, 12 Dec 2024 18:21:18 +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 --- sac-apache-tomcat-10-image/Dockerfile.openjdk11 | 15 +++++++++------ sac-apache-tomcat-10-image/Dockerfile.openjdk17 | 15 +++++++++------ sac-apache-tomcat-10-image/Dockerfile.openjdk21 | 15 +++++++++------ sac-apache-tomcat-9-image/Dockerfile.openjdk11 | 15 +++++++++------ sac-apache-tomcat-9-image/Dockerfile.openjdk17 | 15 +++++++++------ sac-apache-tomcat-9-image/Dockerfile.openjdk21 | 15 +++++++++------ sac-apache-tomcat-9-image/Dockerfile.openjdk8 | 15 +++++++++------ 7 files changed, 63 insertions(+), 42 deletions(-) diff --git a/sac-apache-tomcat-10-image/Dockerfile.openjdk11 b/sac-apache-tomcat-10-image/Dockerfile.openjdk11 index 385e9febe..57e914639 100644 --- a/sac-apache-tomcat-10-image/Dockerfile.openjdk11 +++ b/sac-apache-tomcat-10-image/Dockerfile.openjdk11 @@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 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-11-openjdk java-11-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 java-11-openjdk java-11-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} @@ -67,11 +67,14 @@ CMD ["/usr/lib/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/sac-apache-tomcat-10-image/Dockerfile.openjdk17 b/sac-apache-tomcat-10-image/Dockerfile.openjdk17 index da38f99ff..332992d80 100644 --- a/sac-apache-tomcat-10-image/Dockerfile.openjdk17 +++ b/sac-apache-tomcat-10-image/Dockerfile.openjdk17 @@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 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} @@ -67,11 +67,14 @@ CMD ["/usr/lib/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/sac-apache-tomcat-10-image/Dockerfile.openjdk21 b/sac-apache-tomcat-10-image/Dockerfile.openjdk21 index 55f7ba855..ddae7b514 100644 --- a/sac-apache-tomcat-10-image/Dockerfile.openjdk21 +++ b/sac-apache-tomcat-10-image/Dockerfile.openjdk21 @@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 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} @@ -67,11 +67,14 @@ CMD ["/usr/lib/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/sac-apache-tomcat-9-image/Dockerfile.openjdk11 b/sac-apache-tomcat-9-image/Dockerfile.openjdk11 index 88d93b758..ff1464c16 100644 --- a/sac-apache-tomcat-9-image/Dockerfile.openjdk11 +++ b/sac-apache-tomcat-9-image/Dockerfile.openjdk11 @@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 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-11-openjdk java-11-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat java-11-openjdk java-11-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} @@ -67,11 +67,14 @@ CMD ["/usr/lib/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/sac-apache-tomcat-9-image/Dockerfile.openjdk17 b/sac-apache-tomcat-9-image/Dockerfile.openjdk17 index aa98844ad..fda48213b 100644 --- a/sac-apache-tomcat-9-image/Dockerfile.openjdk17 +++ b/sac-apache-tomcat-9-image/Dockerfile.openjdk17 @@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 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} @@ -67,11 +67,14 @@ CMD ["/usr/lib/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/sac-apache-tomcat-9-image/Dockerfile.openjdk21 b/sac-apache-tomcat-9-image/Dockerfile.openjdk21 index aa123ee20..5a20f01da 100644 --- a/sac-apache-tomcat-9-image/Dockerfile.openjdk21 +++ b/sac-apache-tomcat-9-image/Dockerfile.openjdk21 @@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 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} @@ -67,11 +67,14 @@ CMD ["/usr/lib/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/sac-apache-tomcat-9-image/Dockerfile.openjdk8 b/sac-apache-tomcat-9-image/Dockerfile.openjdk8 index 15f83b230..59edd5154 100644 --- a/sac-apache-tomcat-9-image/Dockerfile.openjdk8 +++ b/sac-apache-tomcat-9-image/Dockerfile.openjdk8 @@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 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-1_8_0-openjdk java-1_8_0-openjdk-headless; \ + zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat java-1_8_0-openjdk java-1_8_0-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} @@ -67,11 +67,14 @@ CMD ["/usr/lib/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 6fc2d1070037f315e8d0509be9842f3a38628eed Mon Sep 17 00:00:00 2001 From: SUSE Update Bot Date: Thu, 12 Dec 2024 18:21:52 +0000 Subject: [PATCH 3/3] Update changelogs for rmt-mariadb-image, sac-apache-tomcat-10-image, sac-apache-tomcat-9-image --- rmt-mariadb-image/rmt-mariadb-image.changes | 5 +++++ .../sac-apache-tomcat-10-image.changes | 5 +++++ sac-apache-tomcat-9-image/sac-apache-tomcat-9-image.changes | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/rmt-mariadb-image/rmt-mariadb-image.changes b/rmt-mariadb-image/rmt-mariadb-image.changes index 4e9513dcd..db0bee95a 100644 --- a/rmt-mariadb-image/rmt-mariadb-image.changes +++ b/rmt-mariadb-image/rmt-mariadb-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 12 18:21:52 UTC 2024 - SUSE Update Bot + +- rename gosu binary + ------------------------------------------------------------------- Tue Dec 3 08:40:44 UTC 2024 - SUSE Update Bot diff --git a/sac-apache-tomcat-10-image/sac-apache-tomcat-10-image.changes b/sac-apache-tomcat-10-image/sac-apache-tomcat-10-image.changes index c62f26cc6..f77a45150 100644 --- a/sac-apache-tomcat-10-image/sac-apache-tomcat-10-image.changes +++ b/sac-apache-tomcat-10-image/sac-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 08:40:44 UTC 2024 - SUSE Update Bot diff --git a/sac-apache-tomcat-9-image/sac-apache-tomcat-9-image.changes b/sac-apache-tomcat-9-image/sac-apache-tomcat-9-image.changes index dc37b02bd..6b43b9994 100644 --- a/sac-apache-tomcat-9-image/sac-apache-tomcat-9-image.changes +++ b/sac-apache-tomcat-9-image/sac-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 08:40:44 UTC 2024 - SUSE Update Bot