Skip to content

Commit 7c61755

Browse files
dirkmuellerdirkmueller
authored
Merge pull request #1621 from SUSE/for-deploy-Tumbleweed
🤖: Update build recipes for Tumbleweed
2 parents dc4c382 + 474569a commit 7c61755

23 files changed

Lines changed: 120 additions & 45 deletions

‎kiwi-image/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#!BuildTag: opensuse/bci/kiwi:10-%RELEASE%
1919
#!BuildTag: opensuse/bci/kiwi:10.1
2020
#!BuildTag: opensuse/bci/kiwi:10.1-%RELEASE%
21-
#!BuildTag: opensuse/bci/kiwi:10.1.4
22-
#!BuildTag: opensuse/bci/kiwi:10.1.4-%RELEASE%
21+
#!BuildTag: opensuse/bci/kiwi:10.1.6
22+
#!BuildTag: opensuse/bci/kiwi:10.1.6-%RELEASE%
2323
#!BuildTag: opensuse/bci/kiwi:latest
2424

2525
FROM opensuse/tumbleweed:latest
@@ -31,7 +31,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends checkmedia dracut-kiwi-oem-r
3131
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
3232
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI KIWI Appliance Builder (kiwi)"
3333
LABEL org.opencontainers.image.description="KIWI Appliance Builder (kiwi) container based on the openSUSE Tumbleweed Base Container Image. This container is only supported in privileged mode."
34-
LABEL org.opencontainers.image.version="10.1.4"
34+
LABEL org.opencontainers.image.version="10.1.6"
3535
LABEL org.opencontainers.image.url="https://www.opensuse.org"
3636
LABEL org.opencontainers.image.created="%BUILDTIME%"
3737
LABEL org.opencontainers.image.vendor="openSUSE Project"

‎kiwi-image/kiwi-image.changes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Mon Sep 9 06:51:05 UTC 2024 - Dirk Mueller <dmueller@suse.com>
3+
4+
- Bump main package version
5+
16
-------------------------------------------------------------------
27
Thu Sep 5 06:33:31 UTC 2024 - Dan Čermák <dcermak@suse.com>
38

‎mariadb-client-image/Dockerfile‎

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

1616

17-
#!BuildTag: opensuse/mariadb-client:11.4
18-
#!BuildTag: opensuse/mariadb-client:11.4-%RELEASE%
17+
#!BuildTag: opensuse/mariadb-client:11.5
18+
#!BuildTag: opensuse/mariadb-client:11.5-%RELEASE%
1919
#!BuildTag: opensuse/mariadb-client:latest
2020

2121
FROM opensuse/tumbleweed:latest
@@ -27,18 +27,18 @@ RUN set -euo pipefail; zypper -n in --no-recommends mariadb-client; zypper -n cl
2727
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
2828
LABEL org.opencontainers.image.title="openSUSE Tumbleweed MariaDB Client"
2929
LABEL org.opencontainers.image.description="MariaDB Client container based on the openSUSE Tumbleweed Base Container Image."
30-
LABEL org.opencontainers.image.version="11.4"
30+
LABEL org.opencontainers.image.version="11.5"
3131
LABEL org.opencontainers.image.url="https://www.opensuse.org"
3232
LABEL org.opencontainers.image.created="%BUILDTIME%"
3333
LABEL org.opencontainers.image.vendor="openSUSE Project"
3434
LABEL org.opencontainers.image.source="%SOURCEURL%"
35-
LABEL org.opencontainers.image.ref.name="11.4-%RELEASE%"
36-
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb-client:11.4-%RELEASE%"
35+
LABEL org.opencontainers.image.ref.name="11.5-%RELEASE%"
36+
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb-client:11.5-%RELEASE%"
3737
LABEL org.openbuildservice.disturl="%DISTURL%"
3838
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
3939
LABEL org.opensuse.release-stage="released"
4040
# endlabelprefix
4141
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/mariadb-client-image/README.md"
4242
CMD ["mariadb"]
4343
# sanity check that the version from the tag is equal to the version of mariadb-client that we expect
44-
RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.4" ]
44+
RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.5" ]

‎mariadb-client-image/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ This image contains the [MariaDB client](https://mariadb.com/kb/en/mariadb-comma
1313
To connect to a MariaDB instance, run the following command:
1414

1515
```ShellSession
16-
$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.4 mariadb -h $HOST_IP -u root -p
16+
$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.5 mariadb -h $HOST_IP -u root -p
1717
```
1818

1919
Use the command below to dump all databases:
2020

2121
```ShellSession
22-
$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.4 mariadb-dump $HOST_IP -p --all-databases > my-dump.sql
22+
$ podman run -it --rm registry.opensuse.org/opensuse/mariadb-client:11.5 mariadb-dump $HOST_IP -p --all-databases > my-dump.sql
2323
```
2424

2525
## Utilities

‎mariadb-client-image/mariadb-client-image.changes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Mon Sep 9 06:51:05 UTC 2024 - Dirk Mueller <dmueller@suse.com>
3+
4+
- Bump main package version
5+
16
-------------------------------------------------------------------
27
Wed Aug 14 12:30:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>
38

‎mariadb-image/Dockerfile‎

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

1616

17-
#!BuildTag: opensuse/mariadb:11.4
18-
#!BuildTag: opensuse/mariadb:11.4-%RELEASE%
17+
#!BuildTag: opensuse/mariadb:11.5
18+
#!BuildTag: opensuse/mariadb:11.5-%RELEASE%
1919
#!BuildTag: opensuse/mariadb:latest
2020

2121
FROM opensuse/tumbleweed:latest
@@ -27,13 +27,13 @@ RUN set -euo pipefail; zypper -n in --no-recommends mariadb mariadb-tools gawk t
2727
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
2828
LABEL org.opencontainers.image.title="openSUSE Tumbleweed MariaDB Server"
2929
LABEL org.opencontainers.image.description="MariaDB Server container based on the openSUSE Tumbleweed Base Container Image."
30-
LABEL org.opencontainers.image.version="11.4"
30+
LABEL org.opencontainers.image.version="11.5"
3131
LABEL org.opencontainers.image.url="https://www.opensuse.org"
3232
LABEL org.opencontainers.image.created="%BUILDTIME%"
3333
LABEL org.opencontainers.image.vendor="openSUSE Project"
3434
LABEL org.opencontainers.image.source="%SOURCEURL%"
35-
LABEL org.opencontainers.image.ref.name="11.4-%RELEASE%"
36-
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb:11.4-%RELEASE%"
35+
LABEL org.opencontainers.image.ref.name="11.5-%RELEASE%"
36+
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/mariadb:11.5-%RELEASE%"
3737
LABEL org.openbuildservice.disturl="%DISTURL%"
3838
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
3939
LABEL org.opensuse.release-stage="released"
@@ -43,7 +43,7 @@ ENTRYPOINT ["docker-entrypoint.sh"]
4343
CMD ["mariadbd"]
4444
EXPOSE 3306
4545
# sanity check that the version from the tag is equal to the version of mariadb-client that we expect
46-
RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.4" ]
46+
RUN set -euo pipefail; [ "$(rpm -q --qf '%{version}' mariadb-client | cut -d '.' -f -2)" = "11.5" ]
4747

4848
RUN set -euo pipefail; mkdir /docker-entrypoint-initdb.d
4949

‎mariadb-image/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ By default, the image launches MariaDB with the same configuration that comes wi
1212
The only environment variable required to start the container is the MariaDB root password.
1313

1414
```ShellSession
15-
$ podman run -it --rm -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.4
15+
$ podman run -it --rm -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.5
1616
```
1717

1818
or:
1919

2020
```ShellSession
21-
$ podman run -it --rm -p 3306:3306 -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 registry.opensuse.org/opensuse/mariadb:11.4
21+
$ podman run -it --rm -p 3306:3306 -e MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 registry.opensuse.org/opensuse/mariadb:11.5
2222
```
2323

2424
### Volumes
@@ -33,7 +33,7 @@ When using the MariaDB image, we recommend one of the following options:
3333
To mount a host directory as a volume for your data run the following command:
3434

3535
```ShellSession
36-
$ podman run -it --rm -v /my/own/datadir:/var/lib/mysql:Z -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.4
36+
$ podman run -it --rm -v /my/own/datadir:/var/lib/mysql:Z -p 3306:3306 -e MARIADB_ROOT_PASSWORD=my-password registry.opensuse.org/opensuse/mariadb:11.5
3737
```
3838

3939
The `-v /my/own/datadir:/var/lib/mysql:Z` part of the command mounts the `/my/own/datadir` directory from the underlying host system as `/var/lib/mysql` inside the container, where MariaDB will by default write its data files.

‎mariadb-image/mariadb-image.changes‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
-------------------------------------------------------------------
2+
Mon Sep 9 06:51:05 UTC 2024 - Dirk Mueller <dmueller@suse.com>
3+
4+
- Bump main package version
5+
16
-------------------------------------------------------------------
27
Wed Sep 4 11:25:11 UTC 2024 - Dan Čermák <dcermak@suse.com>
38

‎postgres-12-image/Dockerfile‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616

1717
#!BuildTag: opensuse/postgres:12
1818
#!BuildTag: opensuse/postgres:12-%RELEASE%
19-
#!BuildTag: opensuse/postgres:%%pg_version%%
20-
#!BuildTag: opensuse/postgres:%%pg_version%%-%RELEASE%
19+
#!BuildTag: opensuse/postgres:%%pg_minor_version%%
20+
#!BuildTag: opensuse/postgres:%%pg_minor_version%%-%RELEASE%
21+
#!BuildTag: opensuse/postgres:%%pg_patch_version%%
22+
#!BuildTag: opensuse/postgres:%%pg_patch_version%%-%RELEASE%
2123

2224
FROM opensuse/tumbleweed:latest
2325

@@ -28,7 +30,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends postgresql12-server findutil
2830
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
2931
LABEL org.opencontainers.image.title="openSUSE Tumbleweed PostgreSQL 12"
3032
LABEL org.opencontainers.image.description="PostgreSQL 12 container based on the openSUSE Tumbleweed Base Container Image."
31-
LABEL org.opencontainers.image.version="12"
33+
LABEL org.opencontainers.image.version="%%pg_patch_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"
@@ -42,7 +44,7 @@ LABEL org.opensuse.release-stage="released"
4244
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/postgres-12-image/README.md"
4345
ENV LANG="en_US.utf8"
4446
ENV PG_MAJOR="12"
45-
ENV PG_VERSION="%%pg_version%%"
47+
ENV PG_VERSION="%%pg_minor_version%%"
4648
ENV PGDATA="/var/lib/pgsql/data"
4749

4850
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

‎postgres-12-image/_service‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@
33
<service mode="buildtime" name="kiwi_metainfo_helper"/>
44
<service name="replace_using_package_version" mode="buildtime">
55
<param name="file">Dockerfile</param>
6-
<param name="regex">%%pg_version%%</param>
6+
<param name="regex">%%pg_minor_version%%</param>
77
<param name="package">postgresql12-server</param>
88
<param name="parse-version">minor</param>
99
</service>
10+
<service name="replace_using_package_version" mode="buildtime">
11+
<param name="file">Dockerfile</param>
12+
<param name="regex">%%pg_patch_version%%</param>
13+
<param name="package">postgresql12-server</param>
14+
</service>
1015
</services>

0 commit comments

Comments
 (0)