Accepting request 1241399 from devel:BCI:Tumbleweed

🤖: sync package with devel:BCI:Tumbleweed from OBS

OBS-URL: https://build.opensuse.org/request/show/1241399
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git-image?expand=0&rev=32
This commit is contained in:
Ana Guerrero 2025-02-04 17:11:49 +00:00 committed by Git OBS Bridge
commit 64291c9fce
5 changed files with 61 additions and 98 deletions

53
Dockerfile Normal file
View File

@ -0,0 +1,53 @@
# SPDX-License-Identifier: GPL-2.0-only
# Copyright (c) 2025 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
#!UseOBSRepositories
#!BuildTag: opensuse/git:%%git_version%%-%RELEASE%
#!BuildTag: opensuse/git:%%git_version%%
#!BuildTag: opensuse/git:2.48
#!BuildTag: opensuse/git:%%git_major_version%%
#!BuildTag: opensuse/git:latest
FROM opensuse/bci/bci-micro:latest AS target
FROM opensuse/tumbleweed:latest AS builder
COPY --from=target / /target
RUN set -euo pipefail; \
zypper -n --installroot /target --gpg-auto-import-keys install --no-recommends git-core openssh-clients; \
zypper -n clean; \
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
# sanity check that the version from the tag is equal to the version of git-core that we expect
RUN set -euo pipefail; \
[ "$(rpm --root /target -q --qf '%{version}' git-core | \
cut -d '.' -f -2)" = "2.48" ]
FROM opensuse/bci/bci-micro:latest
COPY --from=builder /target /
# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=org.opensuse.application.git
LABEL org.opencontainers.image.title="openSUSE Tumbleweed with Git"
LABEL org.opencontainers.image.description="A micro environment with Git based on the openSUSE Tumbleweed Base Container Image."
LABEL org.opencontainers.image.version="%%git_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="%%git_version%%-%RELEASE%"
LABEL org.opensuse.reference="registry.opensuse.org/opensuse/git:%%git_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/git-image/README.md"

View File

@ -1,13 +1,13 @@
<services>
<service mode="buildtime" name="kiwi_label_helper"/>
<service mode="buildtime" name="docker_label_helper"/>
<service mode="buildtime" name="kiwi_metainfo_helper"/>
<service mode="buildtime" name="replace_using_package_version">
<param name="file">git-image.kiwi</param>
<param name="file">Dockerfile</param>
<param name="regex">%%git_version%%</param>
<param name="package">git-core</param>
</service>
<service mode="buildtime" name="replace_using_package_version">
<param name="file">git-image.kiwi</param>
<param name="file">Dockerfile</param>
<param name="regex">%%git_major_version%%</param>
<param name="package">git-core</param>
<param name="parse-version">major</param>

View File

@ -1,31 +0,0 @@
#!/bin/bash
# SPDX-License-Identifier: MIT
# SPDX-FileCopyrightText: (c) 2022-2025 SUSE LLC
set -euo pipefail
test -f /.kconfig && . /.kconfig
test -f /.profile && . /.profile
echo "Configure image: [$kiwi_iname]..."
#============================================
# Import repositories' keys if rpm is present
#--------------------------------------------
if command -v rpm > /dev/null; then
suseImportBuildKey
fi
#=======================================
# Clean up after zypper if it is present
#---------------------------------------
if command -v zypper > /dev/null; then
zypper -n clean
fi
rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
exit 0

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jan 20 08:48:15 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
- Convert container image to Dockerfile
-------------------------------------------------------------------
Wed Jan 15 10:06:13 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>

View File

@ -1,64 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- SPDX-License-Identifier: GPL-2.0-only -->
<!--
Copyright (c) 2025 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
-->
<!-- OBS-AddTag: opensuse/git:%%git_version%%-%RELEASE% opensuse/git:%%git_version%% opensuse/git:2.48 opensuse/git:%%git_major_version%% opensuse/git:latest -->
<!-- OBS-Imagerepo: obsrepositories:/ -->
<image schemaversion="7.4" name="git-image" xmlns:suse_label_helper="com.suse.label_helper">
<description type="system">
<author>openSUSE Project</author>
<contact>https://www.suse.com/</contact>
<specification>openSUSE Tumbleweed with Git Container Image</specification>
</description>
<preferences>
<type image="docker" derived_from="obsrepositories:/opensuse/bci/bci-micro#latest">
<containerconfig
name="opensuse/git"
tag="%%git_version%%-%RELEASE%"
additionaltags="%%git_version%%,2.48,%%git_major_version%%,latest">
<labels>
<suse_label_helper:add_prefix prefix="org.opensuse.application.git">
<label name="org.opencontainers.image.title" value="openSUSE Tumbleweed with Git"/>
<label name="org.opencontainers.image.description" value="A micro environment with Git based on the openSUSE Tumbleweed Base Container Image."/>
<label name="org.opencontainers.image.version" value="%%git_version%%"/>
<label name="org.opencontainers.image.created" value="%BUILDTIME%"/>
<label name="org.opencontainers.image.vendor" value="openSUSE Project"/>
<label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
<label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
<label name="org.opencontainers.image.ref.name" value="%%git_version%%-%RELEASE%"/>
<label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/git:%%git_version%%-%RELEASE%"/>
<label name="org.openbuildservice.disturl" value="%DISTURL%"/>
<label name="org.opensuse.release-stage" value="released"/>
<label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime#openSUSE_BCI"/>
</suse_label_helper:add_prefix>
<label name="io.artifacthub.package.readme-url" value="https://raw.githubusercontent.com/SUSE/BCI-dockerfile-generator/Tumbleweed/git-image/README.md"/>
</labels>
</containerconfig>
</type>
<version>2025</version>
<packagemanager>zypper</packagemanager>
<rpm-check-signatures>false</rpm-check-signatures>
<rpm-excludedocs>true</rpm-excludedocs>
</preferences>
<repository type="rpm-md">
<source path="obsrepositories:/"/>
</repository>
<packages type="bootstrap">
<package name="git-core"/>
<package name="openssh-clients"/>
</packages>
</image>