Skip to content

Commit

Permalink
Test build for #2137
Browse files Browse the repository at this point in the history
  • Loading branch information
SUSE Update Bot committed Dec 12, 2024
1 parent aea8b77 commit 171ef70
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 14 deletions.
6 changes: 4 additions & 2 deletions sac-apache-tomcat-10-image/Dockerfile.openjdk11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -67,8 +67,10 @@ 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
# in case sed stops being in the buildroot, convert the following to a shell
# script
RUN set -euo pipefail; \
sed -i /etc/tomcat/logging.properties \
sed -i /usr/share/tomcat/conf/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|'
Expand Down
6 changes: 4 additions & 2 deletions sac-apache-tomcat-10-image/Dockerfile.openjdk17
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -67,8 +67,10 @@ 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
# in case sed stops being in the buildroot, convert the following to a shell
# script
RUN set -euo pipefail; \
sed -i /etc/tomcat/logging.properties \
sed -i /usr/share/tomcat/conf/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|'
Expand Down
6 changes: 4 additions & 2 deletions sac-apache-tomcat-10-image/Dockerfile.openjdk21
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -67,8 +67,10 @@ 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
# in case sed stops being in the buildroot, convert the following to a shell
# script
RUN set -euo pipefail; \
sed -i /etc/tomcat/logging.properties \
sed -i /usr/share/tomcat/conf/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|'
Expand Down
6 changes: 4 additions & 2 deletions sac-apache-tomcat-9-image/Dockerfile.openjdk11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -67,8 +67,10 @@ 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
# in case sed stops being in the buildroot, convert the following to a shell
# script
RUN set -euo pipefail; \
sed -i /etc/tomcat/logging.properties \
sed -i /usr/share/tomcat/conf/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|'
Expand Down
6 changes: 4 additions & 2 deletions sac-apache-tomcat-9-image/Dockerfile.openjdk17
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -67,8 +67,10 @@ 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
# in case sed stops being in the buildroot, convert the following to a shell
# script
RUN set -euo pipefail; \
sed -i /etc/tomcat/logging.properties \
sed -i /usr/share/tomcat/conf/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|'
Expand Down
6 changes: 4 additions & 2 deletions sac-apache-tomcat-9-image/Dockerfile.openjdk21
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -67,8 +67,10 @@ 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
# in case sed stops being in the buildroot, convert the following to a shell
# script
RUN set -euo pipefail; \
sed -i /etc/tomcat/logging.properties \
sed -i /usr/share/tomcat/conf/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|'
Expand Down
6 changes: 4 additions & 2 deletions sac-apache-tomcat-9-image/Dockerfile.openjdk8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -67,8 +67,10 @@ 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
# in case sed stops being in the buildroot, convert the following to a shell
# script
RUN set -euo pipefail; \
sed -i /etc/tomcat/logging.properties \
sed -i /usr/share/tomcat/conf/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|'
Expand Down

0 comments on commit 171ef70

Please sign in to comment.