Skip to content

Commit

Permalink
Test build for #1602
Browse files Browse the repository at this point in the history
  • Loading branch information
SUSE Update Bot committed Sep 6, 2024
1 parent 72e2c82 commit 2ebf9b3
Show file tree
Hide file tree
Showing 19 changed files with 413 additions and 9 deletions.
7 changes: 7 additions & 0 deletions .obs/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ staging_build:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: php-fpm8-image
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: podman-image
target_project: home:defolos:BCI:CR:Tumbleweed:Staging
- branch_package:
source_project: home:defolos:BCI:CR:Tumbleweed
source_package: postfix-image
Expand Down Expand Up @@ -352,6 +356,9 @@ refresh_devel_BCI:
- trigger_services:
project: devel:BCI:Tumbleweed
package: php-fpm8-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: podman-image
- trigger_services:
project: devel:BCI:Tumbleweed
package: postfix-image
Expand Down
4 changes: 3 additions & 1 deletion golang-oldstable-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#!BuildTag: opensuse/bci/golang:oldstable-2.%RELEASE%
#!BuildTag: opensuse/bci/golang:1.22
#!BuildTag: opensuse/bci/golang:1.22-2.%RELEASE%
#!BuildTag: opensuse/bci/golang:%%golang_version%%
#!BuildTag: opensuse/bci/golang:%%golang_version%%-2.%RELEASE%

FROM opensuse/tumbleweed:latest

Expand All @@ -28,7 +30,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends go1.22 go1.22-doc make curl
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Go 1.22 development"
LABEL org.opencontainers.image.description="Go 1.22 development container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="1.22"
LABEL org.opencontainers.image.version="%%golang_version%%"
LABEL org.opencontainers.image.url="https://www.opensuse.org"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="openSUSE Project"
Expand Down
4 changes: 3 additions & 1 deletion golang-stable-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
#!BuildTag: opensuse/bci/golang:stable-1.%RELEASE%
#!BuildTag: opensuse/bci/golang:1.23
#!BuildTag: opensuse/bci/golang:1.23-1.%RELEASE%
#!BuildTag: opensuse/bci/golang:%%golang_version%%
#!BuildTag: opensuse/bci/golang:%%golang_version%%-1.%RELEASE%
#!BuildTag: opensuse/bci/golang:latest

FROM opensuse/tumbleweed:latest
Expand All @@ -29,7 +31,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends go1.23 go1.23-doc make curl
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Go 1.23 development"
LABEL org.opencontainers.image.description="Go 1.23 development container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="1.23"
LABEL org.opencontainers.image.version="%%golang_version%%"
LABEL org.opencontainers.image.url="https://www.opensuse.org"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="openSUSE Project"
Expand Down
6 changes: 5 additions & 1 deletion nodejs-20-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@

#!BuildTag: opensuse/bci/nodejs:20
#!BuildTag: opensuse/bci/nodejs:20-%RELEASE%
#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%
#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%-%RELEASE%
#!BuildTag: opensuse/bci/nodejs:latest
#!BuildTag: opensuse/bci/node:20
#!BuildTag: opensuse/bci/node:20-%RELEASE%
#!BuildTag: opensuse/bci/node:%%nodejs_version%%
#!BuildTag: opensuse/bci/node:%%nodejs_version%%-%RELEASE%
#!BuildTag: opensuse/bci/node:latest

FROM opensuse/tumbleweed:latest
Expand All @@ -30,7 +34,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends nodejs20 npm20 update-altern
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Node.js 20 development"
LABEL org.opencontainers.image.description="Node.js 20 development container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="20"
LABEL org.opencontainers.image.version="%%nodejs_version%%"
LABEL org.opencontainers.image.url="https://www.opensuse.org"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="openSUSE Project"
Expand Down
5 changes: 5 additions & 0 deletions nodejs-20-image/_service
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%nodejs_version%%</param>
<param name="package">nodejs20</param>
</service>
</services>
6 changes: 5 additions & 1 deletion nodejs-22-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@

#!BuildTag: opensuse/bci/nodejs:22
#!BuildTag: opensuse/bci/nodejs:22-%RELEASE%
#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%
#!BuildTag: opensuse/bci/nodejs:%%nodejs_version%%-%RELEASE%
#!BuildTag: opensuse/bci/node:22
#!BuildTag: opensuse/bci/node:22-%RELEASE%
#!BuildTag: opensuse/bci/node:%%nodejs_version%%
#!BuildTag: opensuse/bci/node:%%nodejs_version%%-%RELEASE%

FROM opensuse/tumbleweed:latest

Expand All @@ -28,7 +32,7 @@ RUN set -euo pipefail; zypper -n in --no-recommends nodejs22 npm22 update-altern
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Node.js 22 development"
LABEL org.opencontainers.image.description="Node.js 22 development container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="22"
LABEL org.opencontainers.image.version="%%nodejs_version%%"
LABEL org.opencontainers.image.url="https://www.opensuse.org"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="openSUSE Project"
Expand Down
5 changes: 5 additions & 0 deletions nodejs-22-image/_service
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<services>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service name="replace_using_package_version" mode="buildtime">
<param name="file">Dockerfile</param>
<param name="regex">%%nodejs_version%%</param>
<param name="package">nodejs22</param>
</service>
</services>
78 changes: 78 additions & 0 deletions podman-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# SPDX-License-Identifier: Apache-2.0

# Copyright (c) 2024 SUSE LLC

# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon.

# The content of THIS FILE IS AUTOGENERATED and should not be manually modified.
# It is maintained by the BCI team and generated by
# https://github.com/SUSE/BCI-dockerfile-generator

# Please submit bugfixes or comments via https://bugs.opensuse.org/
# You can contact the BCI team via https://github.com/SUSE/bci/discussions


#!BuildTag: opensuse/podman:%%podman_version%%
#!BuildTag: opensuse/podman:%%podman_version%%-%RELEASE%
#!BuildTag: opensuse/podman:latest

FROM opensuse/tumbleweed:latest

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}

# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.podman
LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
LABEL org.opencontainers.image.title="openSUSE Tumbleweed Podman"
LABEL org.opencontainers.image.description="Podman container based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="%%podman_version%%"
LABEL org.opencontainers.image.url="https://www.opensuse.org"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="openSUSE Project"
LABEL org.opencontainers.image.source="%SOURCEURL%"
LABEL org.opencontainers.image.ref.name="%%podman_version%%-%RELEASE%"
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/podman:%%podman_version%%-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
LABEL org.opensuse.release-stage="released"
# endlabelprefix
LABEL io.artifacthub.package.readme-url="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/podman-image/README.md"
LABEL io.artifacthub.package.logo-url="https://raw.githubusercontent.com/containers/common/main/logos/podman-logo-full-vert.png"
RUN useradd -U podman && \
echo -e "podman:1:999\npodman:1001:64535" > /etc/subuid && \
echo -e "podman:1:999\npodman:1001:64535" > /etc/subgid

COPY containers.conf /etc/containers/containers.conf
COPY podman-containers.conf /home/podman/.config/containers/containers.conf

RUN mkdir -p /home/podman/.local/share/containers && \
chown podman:podman -R /home/podman && \
chmod 0644 /etc/containers/containers.conf

RUN cp /usr/share/containers/storage.conf /etc/containers/storage.conf
# Copy & modify the defaults to provide reference if runtime changes needed.
# Changes here are required for running with fuse-overlay storage inside container.
RUN sed -i -e 's|^#mount_program|mount_program|g' \
-e '/additionalimage.*/a "/var/lib/shared",' \
-e 's|^mountopt[[:space:]]*=.*$|mountopt = "nodev,fsync=0"|g' \
/etc/containers/storage.conf

VOLUME /var/lib/containers
VOLUME /home/podman/.local/share/containers

RUN mkdir -p /var/lib/shared/overlay-images \
/var/lib/shared/overlay-layers \
/var/lib/shared/vfs-images \
/var/lib/shared/vfs-layers && \
touch /var/lib/shared/overlay-images/images.lock && \
touch /var/lib/shared/overlay-layers/layers.lock && \
touch /var/lib/shared/vfs-images/images.lock && \
touch /var/lib/shared/vfs-layers/layers.lock

# fix capabilities of newuidmap & newgidmap
RUN permctl --system

ENV _CONTAINERS_USERNS_CONFIGURED="" \
BUILDAH_ISOLATION=chroot
Loading

0 comments on commit 2ebf9b3

Please sign in to comment.