Skip to content

Commit 766d3ed

Browse files
dirkmuellerdirkmueller
authored
Merge pull request #2138 from SUSE/for-deploy-6
🤖: Update build recipes for SP6
2 parents aea8b77 + 6fc2d10 commit 766d3ed

File tree

12 files changed

+84
-44
lines changed

12 files changed

+84
-44
lines changed

‎rmt-mariadb-image/Dockerfile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,12 @@ RUN set -euo pipefail; ln -s usr/local/bin/docker-entrypoint.sh / # backwards co
7575
COPY healthcheck.sh /usr/local/bin/
7676
RUN set -euo pipefail; chmod 755 /usr/local/bin/healthcheck.sh
7777

78-
COPY gosu /usr/local/bin/gosu
79-
RUN set -euo pipefail; chmod 755 /usr/local/bin/gosu
78+
COPY idexec /usr/local/bin/idexec
79+
RUN set -euo pipefail; chmod 755 /usr/local/bin/idexec
80+
81+
# replace gosu calls with idexec
82+
RUN set -euo pipefail; sed -i 's/exec gosu /exec idexec /g' /usr/local/bin/docker-entrypoint.sh
83+
RUN set -euo pipefail; sed -i 's/exec gosu /exec idexec /g' /usr/local/bin/healthcheck.sh
8084

8185
RUN set -euo pipefail; sed -i -e 's,$(pwgen .*),$(openssl rand -base64 36),' /usr/local/bin/docker-entrypoint.sh
8286

rmt-mariadb-image/gosu renamed to rmt-mariadb-image/idexec

File renamed without changes.

‎rmt-mariadb-image/rmt-mariadb-image.changes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Thu Dec 12 18:21:52 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
3+
4+
- rename gosu binary
5+
16
-------------------------------------------------------------------
27
Tue Dec 3 08:40:44 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
38

‎sac-apache-tomcat-10-image/Dockerfile.openjdk11‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 AS builder
2828
COPY --from=target / /target
2929

3030
RUN set -euo pipefail; \
31-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-11-openjdk java-11-openjdk-headless; \
31+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 java-11-openjdk java-11-openjdk-headless; \
3232
zypper -n --installroot /target remove util-linux; \
3333
zypper -n clean; \
3434
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
@@ -67,11 +67,14 @@ CMD ["/usr/lib/tomcat/server", "start"]
6767
EXPOSE 8080/tcp
6868
RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat
6969
RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat
70-
RUN set -euo pipefail; \
71-
sed -i /etc/tomcat/logging.properties \
72-
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler|' \
73-
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler|' \
74-
-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|'
70+
RUN set -euo pipefail; while IFS= read -r line; do \
71+
line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler}; \
72+
line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler}; \
73+
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}; \
74+
echo "$line" >> /tmp/logging.properties; \
75+
done < /usr/share/tomcat/conf/logging.properties; \
76+
77+
mv /tmp/logging.properties /usr/share/tomcat/conf/logging.properties
7578

7679
WORKDIR $CATALINA_HOME
7780
USER tomcat

‎sac-apache-tomcat-10-image/Dockerfile.openjdk17‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 AS builder
2828
COPY --from=target / /target
2929

3030
RUN set -euo pipefail; \
31-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-17-openjdk java-17-openjdk-headless; \
31+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 java-17-openjdk java-17-openjdk-headless; \
3232
zypper -n --installroot /target remove util-linux; \
3333
zypper -n clean; \
3434
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
@@ -67,11 +67,14 @@ CMD ["/usr/lib/tomcat/server", "start"]
6767
EXPOSE 8080/tcp
6868
RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat
6969
RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat
70-
RUN set -euo pipefail; \
71-
sed -i /etc/tomcat/logging.properties \
72-
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler|' \
73-
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler|' \
74-
-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|'
70+
RUN set -euo pipefail; while IFS= read -r line; do \
71+
line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler}; \
72+
line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler}; \
73+
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}; \
74+
echo "$line" >> /tmp/logging.properties; \
75+
done < /usr/share/tomcat/conf/logging.properties; \
76+
77+
mv /tmp/logging.properties /usr/share/tomcat/conf/logging.properties
7578

7679
WORKDIR $CATALINA_HOME
7780
USER tomcat

‎sac-apache-tomcat-10-image/Dockerfile.openjdk21‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 AS builder
2828
COPY --from=target / /target
2929

3030
RUN set -euo pipefail; \
31-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 curl sed java-21-openjdk java-21-openjdk-headless; \
31+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat10 java-21-openjdk java-21-openjdk-headless; \
3232
zypper -n --installroot /target remove util-linux; \
3333
zypper -n clean; \
3434
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
@@ -67,11 +67,14 @@ CMD ["/usr/lib/tomcat/server", "start"]
6767
EXPOSE 8080/tcp
6868
RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat
6969
RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat
70-
RUN set -euo pipefail; \
71-
sed -i /etc/tomcat/logging.properties \
72-
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler|' \
73-
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler|' \
74-
-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|'
70+
RUN set -euo pipefail; while IFS= read -r line; do \
71+
line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler}; \
72+
line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler}; \
73+
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}; \
74+
echo "$line" >> /tmp/logging.properties; \
75+
done < /usr/share/tomcat/conf/logging.properties; \
76+
77+
mv /tmp/logging.properties /usr/share/tomcat/conf/logging.properties
7578

7679
WORKDIR $CATALINA_HOME
7780
USER tomcat

‎sac-apache-tomcat-10-image/sac-apache-tomcat-10-image.changes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Thu Dec 12 18:25:14 UTC 2024 - Dirk Müller <dmueller@suse.com>
3+
4+
- remove curl and sed from the image
5+
16
-------------------------------------------------------------------
27
Tue Dec 3 08:40:44 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
38

‎sac-apache-tomcat-9-image/Dockerfile.openjdk11‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 AS builder
2828
COPY --from=target / /target
2929

3030
RUN set -euo pipefail; \
31-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat curl sed java-11-openjdk java-11-openjdk-headless; \
31+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat java-11-openjdk java-11-openjdk-headless; \
3232
zypper -n --installroot /target remove util-linux; \
3333
zypper -n clean; \
3434
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
@@ -67,11 +67,14 @@ CMD ["/usr/lib/tomcat/server", "start"]
6767
EXPOSE 8080/tcp
6868
RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat
6969
RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat
70-
RUN set -euo pipefail; \
71-
sed -i /etc/tomcat/logging.properties \
72-
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler|' \
73-
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler|' \
74-
-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|'
70+
RUN set -euo pipefail; while IFS= read -r line; do \
71+
line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler}; \
72+
line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler}; \
73+
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}; \
74+
echo "$line" >> /tmp/logging.properties; \
75+
done < /usr/share/tomcat/conf/logging.properties; \
76+
77+
mv /tmp/logging.properties /usr/share/tomcat/conf/logging.properties
7578

7679
WORKDIR $CATALINA_HOME
7780
USER tomcat

‎sac-apache-tomcat-9-image/Dockerfile.openjdk17‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 AS builder
2828
COPY --from=target / /target
2929

3030
RUN set -euo pipefail; \
31-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat curl sed java-17-openjdk java-17-openjdk-headless; \
31+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat java-17-openjdk java-17-openjdk-headless; \
3232
zypper -n --installroot /target remove util-linux; \
3333
zypper -n clean; \
3434
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
@@ -67,11 +67,14 @@ CMD ["/usr/lib/tomcat/server", "start"]
6767
EXPOSE 8080/tcp
6868
RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat
6969
RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat
70-
RUN set -euo pipefail; \
71-
sed -i /etc/tomcat/logging.properties \
72-
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler|' \
73-
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler|' \
74-
-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|'
70+
RUN set -euo pipefail; while IFS= read -r line; do \
71+
line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler}; \
72+
line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler}; \
73+
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}; \
74+
echo "$line" >> /tmp/logging.properties; \
75+
done < /usr/share/tomcat/conf/logging.properties; \
76+
77+
mv /tmp/logging.properties /usr/share/tomcat/conf/logging.properties
7578

7679
WORKDIR $CATALINA_HOME
7780
USER tomcat

‎sac-apache-tomcat-9-image/Dockerfile.openjdk21‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ FROM bci/bci-base:15.6 AS builder
2828
COPY --from=target / /target
2929

3030
RUN set -euo pipefail; \
31-
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat curl sed java-21-openjdk java-21-openjdk-headless; \
31+
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends tomcat java-21-openjdk java-21-openjdk-headless; \
3232
zypper -n --installroot /target remove util-linux; \
3333
zypper -n clean; \
3434
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
@@ -67,11 +67,14 @@ CMD ["/usr/lib/tomcat/server", "start"]
6767
EXPOSE 8080/tcp
6868
RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat
6969
RUN set -euo pipefail; ln -s /usr/share/tomcat /usr/local/tomcat
70-
RUN set -euo pipefail; \
71-
sed -i /etc/tomcat/logging.properties \
72-
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler|' \
73-
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[/manager\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler|' \
74-
-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|'
70+
RUN set -euo pipefail; while IFS= read -r line; do \
71+
line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler}; \
72+
line=${line/org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.\[\/manager\]\.handlers =*/org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler}; \
73+
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}; \
74+
echo "$line" >> /tmp/logging.properties; \
75+
done < /usr/share/tomcat/conf/logging.properties; \
76+
77+
mv /tmp/logging.properties /usr/share/tomcat/conf/logging.properties
7578

7679
WORKDIR $CATALINA_HOME
7780
USER tomcat

0 commit comments

Comments
 (0)