diff --git a/Dockerfile.openjdk17 b/Dockerfile.openjdk17 index 1c5a273..8eebd1b 100644 --- a/Dockerfile.openjdk17 +++ b/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/Dockerfile.openjdk21 b/Dockerfile.openjdk21 index cb048c0..64ccd86 100644 --- a/Dockerfile.openjdk21 +++ b/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/Dockerfile.openjdk23 b/Dockerfile.openjdk23 index 95c7d43..c83f263 100644 --- a/Dockerfile.openjdk23 +++ b/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-10-image.changes b/apache-tomcat-10-image.changes index 15e6eb3..9f8fd71 100644 --- a/apache-tomcat-10-image.changes +++ b/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