Skip to content

Commit 5b03055

Browse files
dirkmuellerdirkmueller
authored
Merge pull request #1430 from SUSE/for-deploy-Tumbleweed
🤖: Update build recipes for Tumbleweed
2 parents 159c957 + fa61988 commit 5b03055

11 files changed

Lines changed: 47 additions & 147 deletions

File tree

‎.obs/workflows.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ staging_build:
99
source_project: home:defolos:BCI:CR:Tumbleweed
1010
source_package: alertmanager-image
1111
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
12+
- branch_package:
13+
source_project: home:defolos:BCI:CR:Tumbleweed
14+
source_package: apache-tomcat-10-image
15+
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
16+
- branch_package:
17+
source_project: home:defolos:BCI:CR:Tumbleweed
18+
source_package: apache-tomcat-9-image
19+
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
1220
- branch_package:
1321
source_project: home:defolos:BCI:CR:Tumbleweed
1422
source_package: blackbox_exporter-image
@@ -197,14 +205,6 @@ staging_build:
197205
source_project: home:defolos:BCI:CR:Tumbleweed
198206
source_package: spack-image
199207
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
200-
- branch_package:
201-
source_project: home:defolos:BCI:CR:Tumbleweed
202-
source_package: tomcat-10-image
203-
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
204-
- branch_package:
205-
source_project: home:defolos:BCI:CR:Tumbleweed
206-
source_package: tomcat-9-image
207-
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
208208
- branch_package:
209209
source_project: home:defolos:BCI:CR:Tumbleweed
210210
source_package: trivy-image
@@ -232,6 +232,12 @@ refresh_devel_BCI:
232232
- trigger_services:
233233
project: devel:BCI:Tumbleweed
234234
package: alertmanager-image
235+
- trigger_services:
236+
project: devel:BCI:Tumbleweed
237+
package: apache-tomcat-10-image
238+
- trigger_services:
239+
project: devel:BCI:Tumbleweed
240+
package: apache-tomcat-9-image
235241
- trigger_services:
236242
project: devel:BCI:Tumbleweed
237243
package: blackbox_exporter-image
@@ -373,12 +379,6 @@ refresh_devel_BCI:
373379
- trigger_services:
374380
project: devel:BCI:Tumbleweed
375381
package: spack-image
376-
- trigger_services:
377-
project: devel:BCI:Tumbleweed
378-
package: tomcat-10-image
379-
- trigger_services:
380-
project: devel:BCI:Tumbleweed
381-
package: tomcat-9-image
382382
- trigger_services:
383383
project: devel:BCI:Tumbleweed
384384
package: trivy-image

tomcat-10-image/Dockerfile renamed to apache-tomcat-10-image/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,33 @@
1414
# You can contact the BCI team via https://github.com/SUSE/bci/discussions
1515

1616

17-
#!BuildTag: opensuse/tomcat:10
18-
#!BuildTag: opensuse/tomcat:10-%RELEASE%
19-
#!BuildTag: opensuse/tomcat:%%tomcat_version%%
20-
#!BuildTag: opensuse/tomcat:%%tomcat_version%%-%RELEASE%
21-
#!BuildTag: opensuse/tomcat:%%tomcat_minor%%
22-
#!BuildTag: opensuse/tomcat:%%tomcat_minor%%-%RELEASE%
23-
#!BuildTag: opensuse/tomcat:latest
17+
#!BuildTag: opensuse/apache-tomcat:10
18+
#!BuildTag: opensuse/apache-tomcat:10-%RELEASE%
19+
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%
20+
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-%RELEASE%
21+
#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%
22+
#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-%RELEASE%
23+
#!BuildTag: opensuse/apache-tomcat:latest
2424

2525
FROM opensuse/tumbleweed:latest
2626

2727
MAINTAINER openSUSE (https://www.opensuse.org/)
2828

2929
# Define labels according to https://en.opensuse.org/Building_derived_containers
30-
# labelprefix=org.opensuse.application.tomcat
30+
# labelprefix=org.opensuse.application.apache-tomcat
3131
LABEL org.opencontainers.image.title="openSUSE Tumbleweed Apache Tomcat 10"
3232
LABEL org.opencontainers.image.description="Apache Tomcat 10 container based on the openSUSE Tumbleweed Base Container Image."
3333
LABEL org.opencontainers.image.version="10"
3434
LABEL org.opencontainers.image.url="https://www.opensuse.org"
3535
LABEL org.opencontainers.image.created="%BUILDTIME%"
3636
LABEL org.opencontainers.image.vendor="openSUSE Project"
3737
LABEL org.opencontainers.image.source="%SOURCEURL%"
38-
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/tomcat:10-%RELEASE%"
38+
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10-%RELEASE%"
3939
LABEL org.openbuildservice.disturl="%DISTURL%"
4040
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
4141
LABEL org.opensuse.release-stage="released"
4242
# endlabelprefix
43-
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/tomcat-10-image/README.md"
43+
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-10-image/README.md"
4444
LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png"
4545

4646
RUN set -euo pipefail; zypper -n in --no-recommends tomcat10; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}

tomcat-10-image/README.md renamed to apache-tomcat-10-image/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ To deploy an application, copy the `.war` file into
2222
`$CATALINA_BASE/webapps` (either during a container build or by bind-mounting
2323
the directory), and launch the container using the following command:
2424
```ShellSession
25-
$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/tomcat:10
25+
$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10
2626
```
2727

2828
The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`.
@@ -39,7 +39,7 @@ follows:
3939
```ShellSession
4040
$ chmod 0777 /path/to/my/app
4141
$ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \
42-
-p 8080:8080 registry.opensuse.org/opensuse/tomcat:10
42+
-p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10
4343
```
4444

4545

@@ -55,7 +55,7 @@ options to the container runtime using the `-e` flag:
5555
```ShellSession
5656
$ podman run -it --rm \
5757
-e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \
58-
registry.opensuse.org/opensuse/tomcat:10
58+
registry.opensuse.org/opensuse/apache-tomcat:10
5959
```
6060

6161
The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

tomcat-10-image/_service renamed to apache-tomcat-10-image/_service

File renamed without changes.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-------------------------------------------------------------------
2+
Thu Jul 18 07:38:18 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
3+
4+
- First version of the Apache Tomcat 10 BCI

tomcat-9-image/Dockerfile renamed to apache-tomcat-9-image/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,32 @@
1414
# You can contact the BCI team via https://github.com/SUSE/bci/discussions
1515

1616

17-
#!BuildTag: opensuse/tomcat:9
18-
#!BuildTag: opensuse/tomcat:9-%RELEASE%
19-
#!BuildTag: opensuse/tomcat:%%tomcat_version%%
20-
#!BuildTag: opensuse/tomcat:%%tomcat_version%%-%RELEASE%
21-
#!BuildTag: opensuse/tomcat:%%tomcat_minor%%
22-
#!BuildTag: opensuse/tomcat:%%tomcat_minor%%-%RELEASE%
17+
#!BuildTag: opensuse/apache-tomcat:9
18+
#!BuildTag: opensuse/apache-tomcat:9-%RELEASE%
19+
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%
20+
#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-%RELEASE%
21+
#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%
22+
#!BuildTag: opensuse/apache-tomcat:%%tomcat_minor%%-%RELEASE%
2323

2424
FROM opensuse/tumbleweed:latest
2525

2626
MAINTAINER openSUSE (https://www.opensuse.org/)
2727

2828
# Define labels according to https://en.opensuse.org/Building_derived_containers
29-
# labelprefix=org.opensuse.application.tomcat
29+
# labelprefix=org.opensuse.application.apache-tomcat
3030
LABEL org.opencontainers.image.title="openSUSE Tumbleweed Apache Tomcat 9"
3131
LABEL org.opencontainers.image.description="Apache Tomcat 9 container based on the openSUSE Tumbleweed Base Container Image."
3232
LABEL org.opencontainers.image.version="9"
3333
LABEL org.opencontainers.image.url="https://www.opensuse.org"
3434
LABEL org.opencontainers.image.created="%BUILDTIME%"
3535
LABEL org.opencontainers.image.vendor="openSUSE Project"
3636
LABEL org.opencontainers.image.source="%SOURCEURL%"
37-
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/tomcat:9-%RELEASE%"
37+
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:9-%RELEASE%"
3838
LABEL org.openbuildservice.disturl="%DISTURL%"
3939
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
4040
LABEL org.opensuse.release-stage="released"
4141
# endlabelprefix
42-
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/tomcat-9-image/README.md"
42+
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/apache-tomcat-9-image/README.md"
4343
LABEL io.artifacthub.package.logo-url="https://tomcat.apache.org/res/images/tomcat.png"
4444

4545
RUN set -euo pipefail; zypper -n in --no-recommends tomcat; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}

tomcat-9-image/README.md renamed to apache-tomcat-9-image/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ To deploy an application, copy the `.war` file into
2222
`$CATALINA_BASE/webapps` (either during a container build or by bind-mounting
2323
the directory), and launch the container using the following command:
2424
```ShellSession
25-
$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/tomcat:9
25+
$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:9
2626
```
2727

2828
The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`.
@@ -39,7 +39,7 @@ follows:
3939
```ShellSession
4040
$ chmod 0777 /path/to/my/app
4141
$ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \
42-
-p 8080:8080 registry.opensuse.org/opensuse/tomcat:9
42+
-p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:9
4343
```
4444

4545

@@ -55,7 +55,7 @@ options to the container runtime using the `-e` flag:
5555
```ShellSession
5656
$ podman run -it --rm \
5757
-e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \
58-
registry.opensuse.org/opensuse/tomcat:9
58+
registry.opensuse.org/opensuse/apache-tomcat:9
5959
```
6060

6161
The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

tomcat-9-image/_service renamed to apache-tomcat-9-image/_service

File renamed without changes.

‎apache-tomcat-9-image/apache-tomcat-9-image.changes‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-------------------------------------------------------------------
2+
Thu Jul 18 07:38:18 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
3+
4+
- First version of the Apache Tomcat 9 BCI

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

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)