Skip to content

Commit bf303e3

Browse files
author
SUSE Update Bot
committed
Test build for #1602
1 parent 72e2c82 commit bf303e3

File tree

19 files changed

+387
-9
lines changed

19 files changed

+387
-9
lines changed

.obs/workflows.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,10 @@ staging_build:
153153
source_project: home:defolos:BCI:CR:Tumbleweed
154154
source_package: php-fpm8-image
155155
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
156+
- branch_package:
157+
source_project: home:defolos:BCI:CR:Tumbleweed
158+
source_package: podman-image
159+
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
156160
- branch_package:
157161
source_project: home:defolos:BCI:CR:Tumbleweed
158162
source_package: postfix-image
@@ -352,6 +356,9 @@ refresh_devel_BCI:
352356
- trigger_services:
353357
project: devel:BCI:Tumbleweed
354358
package: php-fpm8-image
359+
- trigger_services:
360+
project: devel:BCI:Tumbleweed
361+
package: podman-image
355362
- trigger_services:
356363
project: devel:BCI:Tumbleweed
357364
package: postfix-image

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-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"

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-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>

podman-image/Dockerfile

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# SPDX-License-Identifier: Apache-2.0
2+
3+
# Copyright (c) 2024 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: opensuse/podman:%%podman_version%%
18+
#!BuildTag: opensuse/podman:%%podman_version%%-%RELEASE%
19+
#!BuildTag: opensuse/podman:latest
20+
21+
FROM opensuse/tumbleweed:latest
22+
23+
RUN set -euo pipefail; zypper -n in --no-recommends podman fuse-overlayfs; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
24+
25+
# Define labels according to https://en.opensuse.org/Building_derived_containers
26+
# labelprefix=org.opensuse.application.podman
27+
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
28+
LABEL org.opencontainers.image.title="openSUSE Tumbleweed Podman"
29+
LABEL org.opencontainers.image.description="Podman container based on the openSUSE Tumbleweed Base Container Image."
30+
LABEL org.opencontainers.image.version="%%podman_version%%"
31+
LABEL org.opencontainers.image.url="https://www.opensuse.org"
32+
LABEL org.opencontainers.image.created="%BUILDTIME%"
33+
LABEL org.opencontainers.image.vendor="openSUSE Project"
34+
LABEL org.opencontainers.image.source="%SOURCEURL%"
35+
LABEL org.opencontainers.image.ref.name="%%podman_version%%-%RELEASE%"
36+
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/podman:%%podman_version%%-%RELEASE%"
37+
LABEL org.openbuildservice.disturl="%DISTURL%"
38+
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
39+
LABEL org.opensuse.release-stage="released"
40+
# endlabelprefix
41+
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/podman-image/README.md"
42+
LABEL io.artifacthub.package.logo-url="https://raw.githubusercontent.com/containers/common/main/logos/podman-logo-full-vert.png"
43+
RUN useradd -U podman && \
44+
echo -e "podman:1:999\npodman:1001:64535" > /etc/subuid && \
45+
echo -e "podman:1:999\npodman:1001:64535" > /etc/subgid
46+
47+
COPY containers.conf /etc/containers/containers.conf
48+
COPY podman-containers.conf /home/podman/.config/containers/containers.conf
49+
50+
RUN mkdir -p /home/podman/.local/share/containers && \
51+
chown podman:podman -R /home/podman && \
52+
chmod 0644 /etc/containers/containers.conf
53+
54+
RUN cp /usr/share/containers/storage.conf /etc/containers/storage.conf
55+
# Copy & modify the defaults to provide reference if runtime changes needed.
56+
# Changes here are required for running with fuse-overlay storage inside container.
57+
RUN sed -i -e 's|^#mount_program|mount_program|g' \
58+
-e '/additionalimage.*/a "/var/lib/shared",' \
59+
-e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' \
60+
/etc/containers/storage.conf
61+
62+
VOLUME /var/lib/containers
63+
VOLUME /home/podman/.local/share/containers
64+
65+
RUN mkdir -p /var/lib/shared/overlay-images \
66+
/var/lib/shared/overlay-layers \
67+
/var/lib/shared/vfs-images \
68+
/var/lib/shared/vfs-layers && \
69+
touch /var/lib/shared/overlay-images/images.lock && \
70+
touch /var/lib/shared/overlay-layers/layers.lock && \
71+
touch /var/lib/shared/vfs-images/images.lock && \
72+
touch /var/lib/shared/vfs-layers/layers.lock
73+
74+
# fix capabilities of newuidmap & newgidmap
75+
RUN permctl --system
76+
77+
ENV _CONTAINERS_USERNS_CONFIGURED="" \
78+
BUILDAH_ISOLATION=chroot

0 commit comments

Comments
 (0)