Skip to content

Commit 7d02432

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

18 files changed

Lines changed: 409 additions & 9 deletions

File tree

.obs/workflows.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@ staging_build:
129129
source_project: home:defolos:BCI:CR:SLE-15-SP7
130130
source_package: php-fpm8-image
131131
target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
132+
- branch_package:
133+
source_project: home:defolos:BCI:CR:SLE-15-SP7
134+
source_package: podman-image
135+
target_project: home:defolos:BCI:CR:SLE-15-SP7:Staging
132136
- branch_package:
133137
source_project: home:defolos:BCI:CR:SLE-15-SP7
134138
source_package: sac-postfix-image
@@ -298,6 +302,9 @@ refresh_devel_BCI:
298302
- trigger_services:
299303
project: devel:BCI:SLE-15-SP7
300304
package: php-fpm8-image
305+
- trigger_services:
306+
project: devel:BCI:SLE-15-SP7
307+
package: podman-image
301308
- trigger_services:
302309
project: devel:BCI:SLE-15-SP7
303310
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.7.1.22.2
2325
FROM bci/bci-base:15.7
@@ -29,7 +31,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends go1.22 go1.22-doc make curl
2931
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
3032
LABEL org.opencontainers.image.title="SLE BCI Go 1.22 development"
3133
LABEL org.opencontainers.image.description="Go 1.22 development container based on the SLE Base Container Image."
32-
LABEL org.opencontainers.image.version="1.22"
34+
LABEL org.opencontainers.image.version="%%golang_version%%"
3335
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
3436
LABEL org.opencontainers.image.created="%BUILDTIME%"
3537
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.7
2325
FROM bci/bci-base:15.7
@@ -29,7 +31,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends go1.20-openssl go1.20-openss
2931
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
3032
LABEL org.opencontainers.image.title="SLE BCI Go 1.20-openssl development"
3133
LABEL org.opencontainers.image.description="Go 1.20-openssl development container based on the SLE Base Container Image."
32-
LABEL org.opencontainers.image.version="1.20-openssl"
34+
LABEL org.opencontainers.image.version="%%golang_version%%"
3335
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
3436
LABEL org.opencontainers.image.created="%BUILDTIME%"
3537
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
#!BuildName: bci-golang-stable
2224
#!BuildVersion: 15.7.1.23.1
2325
FROM bci/bci-base:15.7
@@ -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="SUSE LLC (https://www.suse.com/)"
3032
LABEL org.opencontainers.image.title="SLE BCI Go 1.23 development"
3133
LABEL org.opencontainers.image.description="Go 1.23 development container based on the SLE 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.suse.com/products/base-container-images/"
3436
LABEL org.opencontainers.image.created="%BUILDTIME%"
3537
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
#!BuildName: bci-golang-stable-openssl
2224
#!BuildVersion: 15.7
2325
FROM bci/bci-base:15.7
@@ -29,7 +31,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends go1.21-openssl go1.21-openss
2931
LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
3032
LABEL org.opencontainers.image.title="SLE BCI Go 1.21-openssl development"
3133
LABEL org.opencontainers.image.description="Go 1.21-openssl development container based on the SLE Base Container Image."
32-
LABEL org.opencontainers.image.version="1.21-openssl"
34+
LABEL org.opencontainers.image.version="%%golang_version%%"
3335
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
3436
LABEL org.opencontainers.image.created="%BUILDTIME%"
3537
LABEL org.opencontainers.image.vendor="SUSE LLC"

kiwi-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#!BuildTag: bci/kiwi:9.24.43
2222
#!BuildTag: bci/kiwi:9.24.43-%RELEASE%
2323
#!BuildName: bci-kiwi-9
24-
#!BuildVersion: 15.7.9.24.43
24+
#!BuildVersion: 15.7.9
2525
FROM bci/bci-base:15.7
2626

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

0 commit comments

Comments
 (0)