diff --git a/.obs/workflows.yml b/.obs/workflows.yml index b7773bf2d..6dd6d8d13 100644 --- a/.obs/workflows.yml +++ b/.obs/workflows.yml @@ -9,10 +9,6 @@ staging_build: source_project: home:defolos:BCI:CR:SLE-15-SP7 source_package: alertmanager-image target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging - - branch_package: - source_project: home:defolos:BCI:CR:SLE-15-SP7 - source_package: sac-apache-tomcat-10-java21-image - target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging - branch_package: source_project: home:defolos:BCI:CR:SLE-15-SP7 source_package: blackbox_exporter-image @@ -208,9 +204,6 @@ refresh_devel_BCI: - trigger_services: project: devel:BCI:SLE-15-SP7 package: alertmanager-image - - trigger_services: - project: devel:BCI:SLE-15-SP7 - package: sac-apache-tomcat-10-java21-image - trigger_services: project: devel:BCI:SLE-15-SP7 package: blackbox_exporter-image diff --git a/aspnet-runtime-6.0/Dockerfile b/aspnet-runtime-6.0/Dockerfile index 760673409..42cc90242 100644 --- a/aspnet-runtime-6.0/Dockerfile +++ b/aspnet-runtime-6.0/Dockerfile @@ -30,7 +30,7 @@ FROM bci/bci-base:15.7 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SLE BCI ASP.NET Core Runtime 6.0" LABEL org.opencontainers.image.description="The ASP.NET Core Runtime 6.0 based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties." -LABEL org.opencontainers.image.version="6.0" +LABEL org.opencontainers.image.version="6.0.33" LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" diff --git a/aspnet-runtime-6.0/aspnet-runtime-6.0.changes b/aspnet-runtime-6.0/aspnet-runtime-6.0.changes index a993e37b2..01129ccd9 100644 --- a/aspnet-runtime-6.0/aspnet-runtime-6.0.changes +++ b/aspnet-runtime-6.0/aspnet-runtime-6.0.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 17 07:18:34 UTC 2024 - Dirk Mueller + +- Set the full .Net version for the org.opencontainers.image.version label + ------------------------------------------------------------------- Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller diff --git a/aspnet-runtime-8.0/Dockerfile b/aspnet-runtime-8.0/Dockerfile index d6ada0ec1..116fe6b06 100644 --- a/aspnet-runtime-8.0/Dockerfile +++ b/aspnet-runtime-8.0/Dockerfile @@ -30,7 +30,7 @@ FROM bci/bci-base:15.7 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SLE BCI ASP.NET Core Runtime 8.0" LABEL org.opencontainers.image.description="The ASP.NET Core Runtime 8.0 based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties." -LABEL org.opencontainers.image.version="8.0" +LABEL org.opencontainers.image.version="8.0.8" LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" diff --git a/aspnet-runtime-8.0/aspnet-runtime-8.0.changes b/aspnet-runtime-8.0/aspnet-runtime-8.0.changes index 465a25ef8..d25e66ad0 100644 --- a/aspnet-runtime-8.0/aspnet-runtime-8.0.changes +++ b/aspnet-runtime-8.0/aspnet-runtime-8.0.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 17 07:18:34 UTC 2024 - Dirk Mueller + +- Set the full .Net version for the org.opencontainers.image.version label + ------------------------------------------------------------------- Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller diff --git a/dotnet-6.0/Dockerfile b/dotnet-6.0/Dockerfile index 0a95a3491..79adb2ec9 100644 --- a/dotnet-6.0/Dockerfile +++ b/dotnet-6.0/Dockerfile @@ -30,7 +30,7 @@ FROM bci/bci-base:15.7 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SLE BCI .NET SDK 6.0" LABEL org.opencontainers.image.description="The .NET SDK 6.0 based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties." -LABEL org.opencontainers.image.version="6.0" +LABEL org.opencontainers.image.version="6.0.33" LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" diff --git a/dotnet-6.0/dotnet-6.0.changes b/dotnet-6.0/dotnet-6.0.changes index f039782ac..3e967f84b 100644 --- a/dotnet-6.0/dotnet-6.0.changes +++ b/dotnet-6.0/dotnet-6.0.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 17 07:18:34 UTC 2024 - Dirk Mueller + +- Set the full .Net version for the org.opencontainers.image.version label + ------------------------------------------------------------------- Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller diff --git a/dotnet-8.0/Dockerfile b/dotnet-8.0/Dockerfile index b09db0c73..4d7cbbf19 100644 --- a/dotnet-8.0/Dockerfile +++ b/dotnet-8.0/Dockerfile @@ -30,7 +30,7 @@ FROM bci/bci-base:15.7 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SLE BCI .NET SDK 8.0" LABEL org.opencontainers.image.description="The .NET SDK 8.0 based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties." -LABEL org.opencontainers.image.version="8.0" +LABEL org.opencontainers.image.version="8.0.8" LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" diff --git a/dotnet-8.0/dotnet-8.0.changes b/dotnet-8.0/dotnet-8.0.changes index ec75634d4..ceeeb0123 100644 --- a/dotnet-8.0/dotnet-8.0.changes +++ b/dotnet-8.0/dotnet-8.0.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 17 07:18:34 UTC 2024 - Dirk Mueller + +- Set the full .Net version for the org.opencontainers.image.version label + ------------------------------------------------------------------- Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller diff --git a/dotnet-runtime-6.0/Dockerfile b/dotnet-runtime-6.0/Dockerfile index 41c522a63..3cce007cc 100644 --- a/dotnet-runtime-6.0/Dockerfile +++ b/dotnet-runtime-6.0/Dockerfile @@ -30,7 +30,7 @@ FROM bci/bci-base:15.7 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SLE BCI .NET Runtime 6.0" LABEL org.opencontainers.image.description="The .NET Runtime 6.0 based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties." -LABEL org.opencontainers.image.version="6.0" +LABEL org.opencontainers.image.version="6.0.33" LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" diff --git a/dotnet-runtime-6.0/dotnet-runtime-6.0.changes b/dotnet-runtime-6.0/dotnet-runtime-6.0.changes index d1edde24f..f54bc4d09 100644 --- a/dotnet-runtime-6.0/dotnet-runtime-6.0.changes +++ b/dotnet-runtime-6.0/dotnet-runtime-6.0.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 17 07:18:34 UTC 2024 - Dirk Mueller + +- Set the full .Net version for the org.opencontainers.image.version label + ------------------------------------------------------------------- Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller diff --git a/dotnet-runtime-8.0/Dockerfile b/dotnet-runtime-8.0/Dockerfile index 09ff1a037..cd21777d9 100644 --- a/dotnet-runtime-8.0/Dockerfile +++ b/dotnet-runtime-8.0/Dockerfile @@ -30,7 +30,7 @@ FROM bci/bci-base:15.7 LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="SLE BCI .NET Runtime 8.0" LABEL org.opencontainers.image.description="The .NET Runtime 8.0 based on the SLE Base Container Image. The .NET packages contained in this image come from a 3rd-party repository http://packages.microsoft.com. You can find the respective source code in https://github.com/dotnet. SUSE doesn't provide any support or warranties." -LABEL org.opencontainers.image.version="8.0" +LABEL org.opencontainers.image.version="8.0.8" LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/" LABEL org.opencontainers.image.created="%BUILDTIME%" LABEL org.opencontainers.image.vendor="SUSE LLC" diff --git a/dotnet-runtime-8.0/dotnet-runtime-8.0.changes b/dotnet-runtime-8.0/dotnet-runtime-8.0.changes index 00b939e6e..e63a37fa8 100644 --- a/dotnet-runtime-8.0/dotnet-runtime-8.0.changes +++ b/dotnet-runtime-8.0/dotnet-runtime-8.0.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 17 07:18:34 UTC 2024 - Dirk Mueller + +- Set the full .Net version for the org.opencontainers.image.version label + ------------------------------------------------------------------- Mon Sep 16 08:20:52 UTC 2024 - Dirk Mueller diff --git a/sac-apache-tomcat-10-java21-image/Dockerfile b/sac-apache-tomcat-10-java21-image/Dockerfile deleted file mode 100644 index 4fe483452..000000000 --- a/sac-apache-tomcat-10-java21-image/Dockerfile +++ /dev/null @@ -1,70 +0,0 @@ -# SPDX-License-Identifier: MIT - -# Copyright (c) 2024 SUSE LLC - -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. - -# The content of THIS FILE IS AUTOGENERATED and should not be manually modified. -# It is maintained by the BCI team and generated by -# https://github.com/SUSE/BCI-dockerfile-generator - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# You can contact the BCI team via https://github.com/SUSE/bci/discussions - -#!UseOBSRepositories -#!ExclusiveArch: aarch64 x86_64 -#!BuildTag: containers/apache-tomcat:10-jre21 -#!BuildTag: containers/apache-tomcat:10-jre21-%RELEASE% -#!BuildTag: containers/apache-tomcat:%%tomcat_version%%-jre21 -#!BuildTag: containers/apache-tomcat:%%tomcat_version%%-jre21-%RELEASE% -#!BuildTag: containers/apache-tomcat:%%tomcat_minor%%-jre21 -#!BuildTag: containers/apache-tomcat:%%tomcat_minor%%-jre21-%RELEASE% -#!BuildName: containers-apache-tomcat-10-jre21 -#!BuildVersion: 15.7 -FROM bci/bci-micro:15.7 AS target -FROM bci/bci-base:15.7 AS builder -COPY --from=target / /target - -RUN set -euo pipefail; zypper --installroot /target --gpg-auto-import-keys -n in --no-recommends tomcat10 curl sed java-21-openjdk java-21-openjdk-headless; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2} -FROM target -COPY --from=builder /target / -# Define labels according to https://en.opensuse.org/Building_derived_containers -# labelprefix=com.suse.application.apache-tomcat -LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" -LABEL org.opencontainers.image.title="Apache Tomcat" -LABEL org.opencontainers.image.description="Apache Tomcat is a free and open-source implementation of the Jakarta Servlet, Jakarta Expression Language, and WebSocket technologies, based on the SLE Base Container Image." -LABEL org.opencontainers.image.version="%%tomcat_version%%" -LABEL org.opencontainers.image.url="https://apps.rancher.io/applications/apache-tomcat" -LABEL org.opencontainers.image.created="%BUILDTIME%" -LABEL org.opencontainers.image.vendor="SUSE LLC" -LABEL org.opencontainers.image.source="%SOURCEURL%" -LABEL org.opencontainers.image.ref.name="10-jre21-%RELEASE%" -LABEL org.opensuse.reference="dp.apps.rancher.io/containers/apache-tomcat:10-jre21-%RELEASE%" -LABEL org.openbuildservice.disturl="%DISTURL%" -LABEL com.suse.supportlevel="techpreview" -LABEL com.suse.supportlevel.until="2027-07-01" -LABEL com.suse.eula="sle-eula" -LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15" -LABEL com.suse.release-stage="beta" -# endlabelprefix -LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md" -LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png" -ENV TOMCAT_MAJOR="10" -ENV TOMCAT_VERSION="%%tomcat_version%%" -ENV CATALINA_HOME="/usr/share/tomcat" -ENV CATALINA_BASE="/usr/share/tomcat" -ENV PATH="/usr/share/tomcat/bin:$PATH" - -CMD ["/usr/lib/tomcat/server", "start"] -EXPOSE 8080 -RUN set -euo pipefail; mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/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|' - -WORKDIR $CATALINA_HOME -USER tomcat diff --git a/sac-apache-tomcat-10-java21-image/README.md b/sac-apache-tomcat-10-java21-image/README.md deleted file mode 100644 index 0d557b37d..000000000 --- a/sac-apache-tomcat-10-java21-image/README.md +++ /dev/null @@ -1,81 +0,0 @@ -# Tomcat 10 container image -![Support Level](https://img.shields.io/badge/Support_Level-techpreview-blue)[![SLSA](https://img.shields.io/badge/SLSA_(v1.0)-Build_L3-Green)](https://documentation.suse.com/sbp/server-linux/html/SBP-SLSA4/) -[![Provenance: Available](https://img.shields.io/badge/Provenance-Available-Green)](https://documentation.suse.com/container/all/html/Container-guide/index.html#container-verify) - -## Description -Apache Tomcat (Tomcat for short) is a free and open-source implementation of the -Jakarta Servlet, Jakarta Expression Language, and WebSocket technologies. It -provides a pure Java HTTP web server environment that can run Java code. It is a -Java web application server and not a complete JEE application server. - - -## Usage -By default, the image launches Tomcat with the same configuration as the one -that comes with SUSE Linux Enterprise Server. The difference is that logging is -sent to stdout, meaning that the `podman logs tomcat` command displays Tomcat -logs. - -For security reasons, the image runs as the **tomcat** user and is installed -on a micro base container without a package manager. - -To deploy an application, copy the `.war` file into -`$CATALINA_BASE/webapps` (either during a container build or by bind-mounting -the directory), and launch the container using the following command: -```ShellSession -$ podman run -d --rm -p 8080:8080 dp.apps.rancher.io/containers/apache-tomcat:10-jre21 -``` - -The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`. - - -### How to use the image with rootless Podman - -The container image can be used in rootless mode with Podman. Keep in mind that -Podman remaps the `tomcat` user in the container to a different user on the -host. This user does not have write access to the mounted directory. To avoid -permission issues change permissions of the shared directory to `0777` as -follows: - -```ShellSession -$ chmod 0777 /path/to/my/app -$ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \ - -p 8080:8080 dp.apps.rancher.io/containers/apache-tomcat:10-jre21 -``` - - -## Configuration - -The main Tomcat configuration files (for example -`/etc/tomcat/logging.properties`) are stored in `/etc/tomcat/`. - -Tomcat's runtime options can be configured using the environment variables -`JAVA_OPTS` and `CATALINA_OPTS`. `JAVA_OPTS` specifies general options used for -the JVM, whereas `CATALINA_OPTS` specifies Tomcat's flags. You can pass the -options to the container runtime using the `-e` flag: -```ShellSession -$ podman run -it --rm \ - -e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \ - dp.apps.rancher.io/containers/apache-tomcat:10-jre21 -``` - -The image ships with `CATALINA_HOME` set to `/usr/share/tomcat` -and `CATALINA_BASE` set to `/usr/share/tomcat`. - - -## Upgrading from Tomcat 9 - -Tomcat 9 implements Java EE 8, and Tomcat 10 -implements Jakarta EE 9. Before upgrading from version 9, consult the -[upstream migration guide](https://tomcat.apache.org/migration-10.html). - -## Licensing - -`SPDX-License-Identifier: MIT` - -This documentation and the build recipe are licensed as MIT. -The container itself contains various software components under various open source licenses listed in the associated -Software Bill of Materials (SBOM). - -This image is a tech preview. Do not use it for production. -Your feedback is welcome. -Please report any issues to the [SUSE Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?product=SUSE%20Linux%20Enterprise%20Base%20Container%20Images). diff --git a/sac-apache-tomcat-10-java21-image/_service b/sac-apache-tomcat-10-java21-image/_service deleted file mode 100644 index 152ffcaa0..000000000 --- a/sac-apache-tomcat-10-java21-image/_service +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Dockerfile - %%tomcat_version%% - tomcat10 - - - Dockerfile - %%tomcat_minor%% - tomcat10 - minor - - \ No newline at end of file diff --git a/sac-apache-tomcat-10-java21-image/sac-apache-tomcat-10-java21-image.changes b/sac-apache-tomcat-10-java21-image/sac-apache-tomcat-10-java21-image.changes deleted file mode 100644 index f2883609d..000000000 --- a/sac-apache-tomcat-10-java21-image/sac-apache-tomcat-10-java21-image.changes +++ /dev/null @@ -1,14 +0,0 @@ -------------------------------------------------------------------- -Thu Sep 12 10:37:35 UTC 2024 - Dirk Mueller - -- set useobsrepositories explicitly - -------------------------------------------------------------------- -Thu Sep 12 06:13:49 UTC 2024 - Dirk Mueller - -- use redistributable base container - -------------------------------------------------------------------- -Thu Aug 29 07:05:34 UTC 2024 - SUSE Update Bot - -- First version of the Apache Tomcat %%tomcat_version%% BCI diff --git a/sac-postfix-image/Dockerfile b/sac-postfix-image/Dockerfile index 2b7ecaca9..d1cb67486 100644 --- a/sac-postfix-image/Dockerfile +++ b/sac-postfix-image/Dockerfile @@ -25,7 +25,6 @@ RUN set -euo pipefail; zypper -n in --no-recommends ca-certificates-mozilla cyru # Define labels according to https://en.opensuse.org/Building_derived_containers # labelprefix=com.suse.application.postfix -LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)" LABEL org.opencontainers.image.title="Postfix" LABEL org.opencontainers.image.description="Postfix container is fast and secure mail server, based on the SLE Base Container Image." LABEL org.opencontainers.image.version="%%postfix_version%%" diff --git a/sac-postfix-image/sac-postfix-image.changes b/sac-postfix-image/sac-postfix-image.changes index 5e0315af3..7204b7d2f 100644 --- a/sac-postfix-image/sac-postfix-image.changes +++ b/sac-postfix-image/sac-postfix-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 17 06:37:18 UTC 2024 - Dirk Mueller + +- Remove author label + ------------------------------------------------------------------- Thu Sep 12 10:37:35 UTC 2024 - Dirk Mueller