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

Dockerfile

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

README.md

@@ -1,7 +1,30 @@
-# The openSUSE Tumbleweed with Git container image
+# openSUSE Tumbleweed with Git: Git application container
 ![Redistributable](https://img.shields.io/badge/Redistributable-Yes-green)
 
-A micro environment with Git based on the openSUSE Tumbleweed Base Container Image.
+
+## Description
+
+Git is a distributed version control system that tracks
+versions of files. Git is primarily designed for controlling source code in collaborative software development.
+
+
+## Usage
+
+This container provides the openSUSE Project version of Git.
+
+Example of using Git container:
+
+```ShellSession
+$ podman run registry.opensuse.org/opensuse/git:2.48 git help
+```
+
+As Git requires a repository, the container
+does not explicitly set an entrypoint. This way, you can launch the container in
+interactive mode to clone a repository and work on it. To avoid losing all your changes when exiting the container, use a persistent volume mount on launch.
+
+For more use cases and documentation, refer to the
+[Git SCM documentation](https://git-scm.com/doc).
+
 
 ## Licensing
 

_service

@@ -1,21 +1,15 @@
 <services>
-  <service mode="buildtime" name="kiwi_label_helper"/>
+  <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">git-image.kiwi</param>
+  <service mode="buildtime" name="replace_using_package_version">
+    <param name="file">Dockerfile</param>
     <param name="regex">%%git_version%%</param>
     <param name="package">git-core</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">git-image.kiwi</param>
+  <service mode="buildtime" name="replace_using_package_version">
+    <param name="file">Dockerfile</param>
     <param name="regex">%%git_major_version%%</param>
     <param name="package">git-core</param>
     <param name="parse-version">major</param>
   </service>
-  <service name="replace_using_package_version" mode="buildtime">
-    <param name="file">git-image.kiwi</param>
-    <param name="regex">%%git_minor_version%%</param>
-    <param name="package">git-core</param>
-    <param name="parse-version">minor</param>
-  </service>
 </services>

config.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: MIT
-# SPDX-FileCopyrightText: (c) 2022-2024 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 /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
-
-exit 0

git-image.changes

@@ -1,3 +1,63 @@
+-------------------------------------------------------------------
+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>
+
+- update to new git version
+
+-------------------------------------------------------------------
+Wed Jan  1 14:13:48 UTC 2025 - SUSE Update Bot <bci-internal@suse.de>
+
+- update copyright year
+
+-------------------------------------------------------------------
+Tue Dec  3 13:26:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- Change attribute order in _service
+
+-------------------------------------------------------------------
+Thu Nov 28 14:48:16 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- add/extend README
+
+-------------------------------------------------------------------
+Wed Oct 30 15:34:45 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- remove nonsensical org.opencontainers.image.authors - duplication of .vendor
+
+-------------------------------------------------------------------
+Tue Oct 29 15:23:20 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- drop tag_version-%RELEASE%
+
+-------------------------------------------------------------------
+Mon Oct 14 11:26:26 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the version-%release tag the first one listed; remove duplicates where they existed; update image.ref/reference to point to the version-%release(-) tag
+
+-------------------------------------------------------------------
+Fri Oct 11 15:12:52 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
+
+- make the tag with -%RELEASE% the first tag listed
+
+-------------------------------------------------------------------
+Wed Sep 25 17:12:11 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- improved log cleaning
+
+-------------------------------------------------------------------
+Tue Sep 24 20:00:32 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- remove release tags for additional_versions
+
+-------------------------------------------------------------------
+Fri Sep 13 09:56:19 UTC 2024 - Dirk Mueller <dmueller@suse.com>
+
+- Remove trailing whitespace
+
 -------------------------------------------------------------------
 Fri Sep  6 08:22:49 UTC 2024 - Dirk Mueller <dmueller@suse.com>
 

git-image.kiwi

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- SPDX-License-Identifier: GPL-2.0-only -->
-<!-- 
-    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
--->
-<!-- OBS-AddTag: opensuse/git:%%git_minor_version%% opensuse/git:%%git_minor_version%%-%RELEASE% opensuse/git:%%git_major_version%% opensuse/git:%%git_major_version%%-%RELEASE% opensuse/git:%%git_version%% opensuse/git:%%git_version%%-%RELEASE% 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_minor_version%%"
-          additionaltags="%%git_minor_version%%-%RELEASE%,%%git_major_version%%,%%git_major_version%%-%RELEASE%,%%git_version%%,%%git_version%%-%RELEASE%,latest">
-        <labels>
-          <suse_label_helper:add_prefix prefix="org.opensuse.application.git">
-            <label name="org.opencontainers.image.authors" value="openSUSE (https://www.opensuse.org/)"/>
-            <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_minor_version%%-%RELEASE%"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/git:%%git_minor_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>2024</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>