Skip to content

Commit b68d233

Browse files
authored
Merge pull request #716 from SUSE/for-deploy-Basalt
🤖: Update build recipes for Basalt
2 parents 6c419b3 + 9421989 commit b68d233

File tree

9 files changed

+557
-0
lines changed

9 files changed

+557
-0
lines changed

.obs/workflows.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@ staging_build:
99
source_project: home:defolos:BCI:CR:Basalt
1010
source_package: init-image
1111
target_project: home:defolos:BCI:CR:Basalt:Staging
12+
- branch_package:
13+
source_project: home:defolos:BCI:CR:Basalt
14+
source_package: mariadb-image
15+
target_project: home:defolos:BCI:CR:Basalt:Staging
16+
- branch_package:
17+
source_project: home:defolos:BCI:CR:Basalt
18+
source_package: mariadb-client-image
19+
target_project: home:defolos:BCI:CR:Basalt:Staging
1220
- branch_package:
1321
source_project: home:defolos:BCI:CR:Basalt
1422
source_package: minimal-image
@@ -36,6 +44,12 @@ refresh_devel_BCI:
3644
- trigger_services:
3745
project: devel:BCI:Basalt
3846
package: init-image
47+
- trigger_services:
48+
project: devel:BCI:Basalt
49+
package: mariadb-image
50+
- trigger_services:
51+
project: devel:BCI:Basalt
52+
package: mariadb-client-image
3953
- trigger_services:
4054
project: devel:BCI:Basalt
4155
package: minimal-image

mariadb-client-image/Dockerfile

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# SPDX-License-Identifier: MIT
2+
3+
# Copyright (c) 2023 SUSE LLC
4+
5+
# All modifications and additions to the file contributed by third parties
6+
# remain the property of their copyright owners, unless otherwise agreed
7+
# upon.
8+
9+
# The content of THIS FILE IS AUTOGENERATED and should not be manually modified.
10+
# It is maintained by the BCI team and generated by
11+
# https://github.com/SUSE/BCI-dockerfile-generator
12+
13+
# Please submit bugfixes or comments via https://bugs.opensuse.org/
14+
# You can contact the BCI team via https://github.com/SUSE/bci/discussions
15+
16+
17+
#!BuildTag: suse/mariadb-client:%%mariadb_version%%
18+
#!BuildTag: suse/mariadb-client:%%mariadb_version%%-%RELEASE%
19+
#!BuildTag: suse/mariadb-client:latest
20+
21+
FROM alp/bci/bci-base:latest
22+
23+
MAINTAINER SUSE LLC (https://www.suse.com/)
24+
25+
# Define labels according to https://en.opensuse.org/Building_derived_containers
26+
# labelprefix=com.suse.basalt.application.mariadb-client
27+
LABEL org.opencontainers.image.title="Basalt Project MariaDB Client"
28+
LABEL org.opencontainers.image.description="MariaDB Client container based on the SUSE Adaptable Linux Platform (ALP)."
29+
LABEL org.opencontainers.image.version="%%mariadb_version%%"
30+
LABEL org.opencontainers.image.url="https://susealp.io/"
31+
LABEL org.opencontainers.image.created="%BUILDTIME%"
32+
LABEL org.opencontainers.image.vendor="SUSE LLC"
33+
LABEL org.opencontainers.image.source="%SOURCEURL%"
34+
LABEL org.opensuse.reference="registry.suse.com/suse/mariadb-client:%%mariadb_version%%-%RELEASE%"
35+
LABEL org.openbuildservice.disturl="%DISTURL%"
36+
LABEL com.suse.supportlevel="techpreview"
37+
LABEL com.suse.eula="sle-bci"
38+
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
39+
LABEL com.suse.image-type="application"
40+
LABEL com.suse.release-stage="beta"
41+
# endlabelprefix
42+
43+
RUN set -euo pipefail; zypper -n in --no-recommends mariadb-client; zypper -n clean; rm -rf /var/log/*
44+
CMD ["mariadb"]

mariadb-client-image/_service

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<services>
2+
<service mode="buildtime" name="docker_label_helper"/>
3+
<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">%%mariadb_version%%</param>
7+
<param name="package">mariadb-client</param>
8+
<param name="parse-version">minor</param>
9+
</service>
10+
</services>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-------------------------------------------------------------------
2+
Mon Oct 16 09:06:30 UTC 2023 - SUSE Update Bot <bci-internal@suse.de>
3+
4+
- First version of the MariaDB Client BCI

mariadb-image/Dockerfile

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# SPDX-License-Identifier: MIT
2+
3+
# Copyright (c) 2023 SUSE LLC
4+
5+
# All modifications and additions to the file contributed by third parties
6+
# remain the property of their copyright owners, unless otherwise agreed
7+
# upon.
8+
9+
# The content of THIS FILE IS AUTOGENERATED and should not be manually modified.
10+
# It is maintained by the BCI team and generated by
11+
# https://github.com/SUSE/BCI-dockerfile-generator
12+
13+
# Please submit bugfixes or comments via https://bugs.opensuse.org/
14+
# You can contact the BCI team via https://github.com/SUSE/bci/discussions
15+
16+
17+
#!BuildTag: suse/mariadb:%%mariadb_version%%
18+
#!BuildTag: suse/mariadb:%%mariadb_version%%-%RELEASE%
19+
#!BuildTag: suse/mariadb:latest
20+
21+
FROM alp/bci/bci-base:latest
22+
23+
MAINTAINER SUSE LLC (https://www.suse.com/)
24+
25+
# Define labels according to https://en.opensuse.org/Building_derived_containers
26+
# labelprefix=com.suse.basalt.application.mariadb
27+
LABEL org.opencontainers.image.title="Basalt Project MariaDB Server"
28+
LABEL org.opencontainers.image.description="MariaDB Server container based on the SUSE Adaptable Linux Platform (ALP)."
29+
LABEL org.opencontainers.image.version="%%mariadb_version%%"
30+
LABEL org.opencontainers.image.url="https://susealp.io/"
31+
LABEL org.opencontainers.image.created="%BUILDTIME%"
32+
LABEL org.opencontainers.image.vendor="SUSE LLC"
33+
LABEL org.opencontainers.image.source="%SOURCEURL%"
34+
LABEL org.opensuse.reference="registry.suse.com/suse/mariadb:%%mariadb_version%%-%RELEASE%"
35+
LABEL org.openbuildservice.disturl="%DISTURL%"
36+
LABEL com.suse.supportlevel="techpreview"
37+
LABEL com.suse.eula="sle-bci"
38+
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
39+
LABEL com.suse.image-type="application"
40+
LABEL com.suse.release-stage="beta"
41+
# endlabelprefix
42+
43+
RUN set -euo pipefail; zypper -n in --no-recommends mariadb mariadb-tools gawk timezone util-linux; zypper -n clean; rm -rf /var/log/*
44+
ENTRYPOINT ["docker-entrypoint.sh"]
45+
CMD ["mariadbd"]
46+
EXPOSE 3306
47+
RUN set -euo pipefail; mkdir /docker-entrypoint-initdb.d
48+
49+
# docker-entrypoint from https://github.com/MariaDB/mariadb-docker.git
50+
COPY docker-entrypoint.sh /usr/local/bin/
51+
RUN set -euo pipefail; chmod 755 /usr/local/bin/docker-entrypoint.sh
52+
RUN set -euo pipefail; ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
53+
54+
RUN set -euo pipefail; sed -i 's#gosu mysql#su mysql -s /bin/bash -m#g' /usr/local/bin/docker-entrypoint.sh
55+
56+
# Ensure all logs goes to stdout
57+
RUN set -euo pipefail; sed -i 's/^log/#log/g' /etc/my.cnf
58+
59+
# Disable binding to localhost only, doesn't make sense in a container
60+
RUN set -euo pipefail; sed -i -e 's|^\(bind-address.*\)|#\1|g' /etc/my.cnf
61+
62+
RUN set -euo pipefail; mkdir /run/mysql
63+
64+
VOLUME /var/lib/mysql

mariadb-image/_constraints

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<constraints>
2+
<hardware>
3+
<disk>
4+
<size unit="G">11</size>
5+
</disk>
6+
</hardware>
7+
</constraints>

mariadb-image/_service

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<services>
2+
<service mode="buildtime" name="docker_label_helper"/>
3+
<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">%%mariadb_version%%</param>
7+
<param name="package">mariadb</param>
8+
<param name="parse-version">minor</param>
9+
</service>
10+
</services>

0 commit comments

Comments
 (0)