Skip to content

Commit 3366437

Browse files
author
SUSE Update Bot
committed
Test build for #1602
1 parent 7db7f64 commit 3366437

File tree

20 files changed

+391
-11
lines changed

20 files changed

+391
-11
lines changed

.obs/workflows.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ staging_build:
133133
source_project: home:defolos:BCI:CR:SLE-15-SP6
134134
source_package: php-fpm8-image
135135
target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
136+
- branch_package:
137+
source_project: home:defolos:BCI:CR:SLE-15-SP6
138+
source_package: podman-image
139+
target_project: home:defolos:BCI:CR:SLE-15-SP6:Staging
136140
- branch_package:
137141
source_project: home:defolos:BCI:CR:SLE-15-SP6
138142
source_package: sac-postfix-image
@@ -317,6 +321,9 @@ refresh_devel_BCI:
317321
- trigger_services:
318322
project: devel:BCI:SLE-15-SP6
319323
package: php-fpm8-image
324+
- trigger_services:
325+
project: devel:BCI:SLE-15-SP6
326+
package: podman-image
320327
- trigger_services:
321328
project: devel:BCI:SLE-15-SP6
322329
package: sac-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: bci/golang:oldstable-2.%RELEASE%
1919
#!BuildTag: bci/golang:1.22
2020
#!BuildTag: bci/golang:1.22-2.%RELEASE%
21+
#!BuildTag: bci/golang:%%golang_version%%
22+
#!BuildTag: bci/golang:%%golang_version%%-2.%RELEASE%
2123
#!BuildName: bci-golang-oldstable
2224
#!BuildVersion: 15.6.1.22.2
2325
#!BuildRelease: 33
@@ -30,7 +32,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends go1.22 go1.22-doc make curl
3032
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
3133
LABEL org.opencontainers.image.title="SLE BCI Go 1.22 development"
3234
LABEL org.opencontainers.image.description="Go 1.22 development container based on the SLE Base Container Image."
33-
LABEL org.opencontainers.image.version="1.22"
35+
LABEL org.opencontainers.image.version="%%golang_version%%"
3436
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
3537
LABEL org.opencontainers.image.created="%BUILDTIME%"
3638
LABEL org.opencontainers.image.vendor="SUSE LLC"

golang-oldstable-openssl-image/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#!BuildTag: bci/golang:oldstable-openssl-%RELEASE%
1919
#!BuildTag: bci/golang:1.20-openssl
2020
#!BuildTag: bci/golang:1.20-openssl-%RELEASE%
21+
#!BuildTag: bci/golang:%%golang_version%%
22+
#!BuildTag: bci/golang:%%golang_version%%-%RELEASE%
2123
#!BuildName: bci-golang-oldstable-openssl
2224
#!BuildVersion: 15.6
2325
#!BuildRelease: 33
@@ -30,7 +32,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends go1.20-openssl go1.20-openss
3032
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
3133
LABEL org.opencontainers.image.title="SLE BCI Go 1.20-openssl development"
3234
LABEL org.opencontainers.image.description="Go 1.20-openssl development container based on the SLE Base Container Image."
33-
LABEL org.opencontainers.image.version="1.20-openssl"
35+
LABEL org.opencontainers.image.version="%%golang_version%%"
3436
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
3537
LABEL org.opencontainers.image.created="%BUILDTIME%"
3638
LABEL org.opencontainers.image.vendor="SUSE LLC"

golang-stable-image/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#!BuildTag: bci/golang:stable-1.%RELEASE%
1919
#!BuildTag: bci/golang:1.23
2020
#!BuildTag: bci/golang:1.23-1.%RELEASE%
21+
#!BuildTag: bci/golang:%%golang_version%%
22+
#!BuildTag: bci/golang:%%golang_version%%-1.%RELEASE%
2123
#!BuildTag: bci/golang:latest
2224
#!BuildName: bci-golang-stable
2325
#!BuildVersion: 15.6.1.23.1
@@ -31,7 +33,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends go1.23 go1.23-doc make curl
3133
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
3234
LABEL org.opencontainers.image.title="SLE BCI Go 1.23 development"
3335
LABEL org.opencontainers.image.description="Go 1.23 development container based on the SLE Base Container Image."
34-
LABEL org.opencontainers.image.version="1.23"
36+
LABEL org.opencontainers.image.version="%%golang_version%%"
3537
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
3638
LABEL org.opencontainers.image.created="%BUILDTIME%"
3739
LABEL org.opencontainers.image.vendor="SUSE LLC"

golang-stable-openssl-image/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#!BuildTag: bci/golang:stable-openssl-%RELEASE%
1919
#!BuildTag: bci/golang:1.21-openssl
2020
#!BuildTag: bci/golang:1.21-openssl-%RELEASE%
21+
#!BuildTag: bci/golang:%%golang_version%%
22+
#!BuildTag: bci/golang:%%golang_version%%-%RELEASE%
2123
#!BuildTag: bci/golang:latest
2224
#!BuildName: bci-golang-stable-openssl
2325
#!BuildVersion: 15.6
@@ -31,7 +33,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends go1.21-openssl go1.21-openss
3133
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
3234
LABEL org.opencontainers.image.title="SLE BCI Go 1.21-openssl development"
3335
LABEL org.opencontainers.image.description="Go 1.21-openssl development container based on the SLE Base Container Image."
34-
LABEL org.opencontainers.image.version="1.21-openssl"
36+
LABEL org.opencontainers.image.version="%%golang_version%%"
3537
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
3638
LABEL org.opencontainers.image.created="%BUILDTIME%"
3739
LABEL org.opencontainers.image.vendor="SUSE LLC"

kiwi-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#!BuildTag: bci/kiwi:9.24.43-%RELEASE%
2323
#!BuildTag: bci/kiwi:latest
2424
#!BuildName: bci-kiwi-9
25-
#!BuildVersion: 15.6.9.24.43
25+
#!BuildVersion: 15.6.9
2626
FROM bci/bci-base:15.6
2727

2828
RUN set -euo pipefail; zypper -n in --no-recommends checkmedia dracut-kiwi-oem-repart enchant-devel gcc glibc-devel iproute2 java-21-openjdk-headless jing kiwi-systemdeps-filesystems kpartx libxml2-devel lvm2 make netcat-openbsd python3-devel python3-kiwi python3-pip tack timezone xorriso xz; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}

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: bci/nodejs:20
1818
#!BuildTag: bci/nodejs:20-%RELEASE%
19+
#!BuildTag: bci/nodejs:%%nodejs_version%%
20+
#!BuildTag: bci/nodejs:%%nodejs_version%%-%RELEASE%
1921
#!BuildTag: bci/nodejs:latest
2022
#!BuildTag: bci/node:20
2123
#!BuildTag: bci/node:20-%RELEASE%
24+
#!BuildTag: bci/node:%%nodejs_version%%
25+
#!BuildTag: bci/node:%%nodejs_version%%-%RELEASE%
2226
#!BuildTag: bci/node:latest
2327
#!BuildName: bci-nodejs-20
2428
#!BuildVersion: 15.6.20
@@ -32,7 +36,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends nodejs20 npm20 update-altern
3236
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
3337
LABEL org.opencontainers.image.title="SLE BCI Node.js 20 development"
3438
LABEL org.opencontainers.image.description="Node.js 20 development container based on the SLE Base Container Image."
35-
LABEL org.opencontainers.image.version="20"
39+
LABEL org.opencontainers.image.version="%%nodejs_version%%"
3640
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
3741
LABEL org.opencontainers.image.created="%BUILDTIME%"
3842
LABEL org.opencontainers.image.vendor="SUSE LLC"

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>

podman-image/Dockerfile

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

0 commit comments

Comments
 (0)