Skip to content

Commit dc4c382

Browse files
authored
Merge pull request #1613 from SUSE/for-deploy-Tumbleweed
🤖: Update build recipes for Tumbleweed
2 parents 72e2c82 + f081c53 commit dc4c382

20 files changed

Lines changed: 86 additions & 9 deletions

File tree

golang-oldstable-image/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#!BuildTag: opensuse/bci/golang:oldstable-2.%RELEASE%
1919
#!BuildTag: opensuse/bci/golang:1.22
2020
#!BuildTag: opensuse/bci/golang:1.22-2.%RELEASE%
21+
#!BuildTag: opensuse/bci/golang:%%golang_version%%
22+
#!BuildTag: opensuse/bci/golang:%%golang_version%%-2.%RELEASE%
2123

2224
FROM opensuse/tumbleweed:latest
2325

@@ -28,7 +30,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends go1.22 go1.22-doc make curl
2830
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
2931
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Go 1.22 development"
3032
LABEL org.opencontainers.image.description="Go 1.22 development container based on the openSUSE Tumbleweed Base Container Image."
31-
LABEL org.opencontainers.image.version="1.22"
33+
LABEL org.opencontainers.image.version="%%golang_version%%"
3234
LABEL org.opencontainers.image.url="https://www.opensuse.org"
3335
LABEL org.opencontainers.image.created="%BUILDTIME%"
3436
LABEL org.opencontainers.image.vendor="openSUSE Project"

golang-oldstable-image/golang-oldstable-image.changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Fri Sep 6 11:30:01 UTC 2024 - Dirk Mueller <dmueller@suse.com>
3+
4+
- use full version in version label
5+
16
-------------------------------------------------------------------
27
Fri Aug 16 16:04:02 UTC 2024 - Dirk Mueller <dmueller@suse.com>
38

golang-stable-image/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#!BuildTag: opensuse/bci/golang:stable-1.%RELEASE%
1919
#!BuildTag: opensuse/bci/golang:1.23
2020
#!BuildTag: opensuse/bci/golang:1.23-1.%RELEASE%
21+
#!BuildTag: opensuse/bci/golang:%%golang_version%%
22+
#!BuildTag: opensuse/bci/golang:%%golang_version%%-1.%RELEASE%
2123
#!BuildTag: opensuse/bci/golang:latest
2224

2325
FROM opensuse/tumbleweed:latest
@@ -29,7 +31,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends go1.23 go1.23-doc make curl
2931
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
3032
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Go 1.23 development"
3133
LABEL org.opencontainers.image.description="Go 1.23 development container based on the openSUSE Tumbleweed Base Container Image."
32-
LABEL org.opencontainers.image.version="1.23"
34+
LABEL org.opencontainers.image.version="%%golang_version%%"
3335
LABEL org.opencontainers.image.url="https://www.opensuse.org"
3436
LABEL org.opencontainers.image.created="%BUILDTIME%"
3537
LABEL org.opencontainers.image.vendor="openSUSE Project"

golang-stable-image/golang-stable-image.changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Fri Sep 6 11:30:01 UTC 2024 - Dirk Mueller <dmueller@suse.com>
3+
4+
- use full version in version label
5+
16
-------------------------------------------------------------------
27
Fri Aug 16 16:04:16 UTC 2024 - Dirk Mueller <dmueller@suse.com>
38

nodejs-20-image/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@
1616

1717
#!BuildTag: opensuse/bci/nodejs:20
1818
#!BuildTag: opensuse/bci/nodejs:20-%RELEASE%
19+
#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%
20+
#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%-%RELEASE%
1921
#!BuildTag: opensuse/bci/nodejs:latest
2022
#!BuildTag: opensuse/bci/node:20
2123
#!BuildTag: opensuse/bci/node:20-%RELEASE%
24+
#!BuildTag: opensuse/bci/node:%%nodejs_version%%
25+
#!BuildTag: opensuse/bci/node:%%nodejs_version%%-%RELEASE%
2226
#!BuildTag: opensuse/bci/node:latest
2327

2428
FROM opensuse/tumbleweed:latest
@@ -30,7 +34,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends nodejs20 npm20 update-altern
3034
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
3135
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Node.js 20 development"
3236
LABEL org.opencontainers.image.description="Node.js 20 development container based on the openSUSE Tumbleweed Base Container Image."
33-
LABEL org.opencontainers.image.version="20"
37+
LABEL org.opencontainers.image.version="%%nodejs_version%%"
3438
LABEL org.opencontainers.image.url="https://www.opensuse.org"
3539
LABEL org.opencontainers.image.created="%BUILDTIME%"
3640
LABEL org.opencontainers.image.vendor="openSUSE Project"

nodejs-20-image/_service

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<services>
22
<service mode="buildtime" name="docker_label_helper"/>
33
<service mode="buildtime" name="kiwi_metainfo_helper"/>
4+
<service name="replace_using_package_version" mode="buildtime">
5+
<param name="file">Dockerfile</param>
6+
<param name="regex">%%nodejs_version%%</param>
7+
<param name="package">nodejs20</param>
8+
</service>
49
</services>

nodejs-20-image/nodejs-20-image.changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Fri Sep 6 11:30:01 UTC 2024 - Dirk Mueller <dmueller@suse.com>
3+
4+
- use full version in version label
5+
16
-------------------------------------------------------------------
27
Wed Aug 14 12:30:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>
38

nodejs-22-image/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616

1717
#!BuildTag: opensuse/bci/nodejs:22
1818
#!BuildTag: opensuse/bci/nodejs:22-%RELEASE%
19+
#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%
20+
#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%-%RELEASE%
1921
#!BuildTag: opensuse/bci/node:22
2022
#!BuildTag: opensuse/bci/node:22-%RELEASE%
23+
#!BuildTag: opensuse/bci/node:%%nodejs_version%%
24+
#!BuildTag: opensuse/bci/node:%%nodejs_version%%-%RELEASE%
2125

2226
FROM opensuse/tumbleweed:latest
2327

@@ -28,7 +32,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends nodejs22 npm22 update-altern
2832
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
2933
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Node.js 22 development"
3034
LABEL org.opencontainers.image.description="Node.js 22 development container based on the openSUSE Tumbleweed Base Container Image."
31-
LABEL org.opencontainers.image.version="22"
35+
LABEL org.opencontainers.image.version="%%nodejs_version%%"
3236
LABEL org.opencontainers.image.url="https://www.opensuse.org"
3337
LABEL org.opencontainers.image.created="%BUILDTIME%"
3438
LABEL org.opencontainers.image.vendor="openSUSE Project"

nodejs-22-image/_service

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<services>
22
<service mode="buildtime" name="docker_label_helper"/>
33
<service mode="buildtime" name="kiwi_metainfo_helper"/>
4+
<service name="replace_using_package_version" mode="buildtime">
5+
<param name="file">Dockerfile</param>
6+
<param name="regex">%%nodejs_version%%</param>
7+
<param name="package">nodejs22</param>
8+
</service>
49
</services>

nodejs-22-image/nodejs-22-image.changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Fri Sep 6 11:30:01 UTC 2024 - Dirk Mueller <dmueller@suse.com>
3+
4+
- use full version in version label
5+
16
-------------------------------------------------------------------
27
Wed Aug 14 12:30:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>
38

0 commit comments

Comments
 (0)