Skip to content

Commit

Permalink
Merge pull request #2212 from SUSE/for-deploy-7
Browse files Browse the repository at this point in the history
🤖: Update build recipes for SP7
  • Loading branch information
dcermak authored Jan 23, 2025
2 parents 48308c2 + 5c7d5fb commit 722e925
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 102 deletions.
56 changes: 56 additions & 0 deletions git-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# 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: suse/git:%%git_version%%-%RELEASE%
#!BuildTag: suse/git:%%git_version%%
#!BuildTag: suse/git:2.43
#!BuildTag: suse/git:%%git_major_version%%
#!BuildName: suse-git-2.43
#!BuildVersion: 15.7.2.43
FROM bci/bci-micro:15.7 AS target
FROM suse/sle15:15.7 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.43" ]
FROM bci/bci-micro:15.7
COPY --from=builder /target /
# Define labels according to https://en.opensuse.org/Building_derived_containers
# labelprefix=com.suse.application.git
LABEL org.opencontainers.image.authors="https://github.com/SUSE/bci/discussions"
LABEL org.opencontainers.image.title="SLE 15 SP7 with Git"
LABEL org.opencontainers.image.description="A micro environment with Git based on the SLE Base Container Image."
LABEL org.opencontainers.image.version="%%git_version%%"
LABEL org.opencontainers.image.url="https://www.suse.com/products/base-container-images/"
LABEL org.opencontainers.image.created="%BUILDTIME%"
LABEL org.opencontainers.image.vendor="SUSE LLC"
LABEL org.opencontainers.image.source="%SOURCEURL%"
LABEL org.opencontainers.image.ref.name="%%git_version%%-%RELEASE%"
LABEL org.opensuse.reference="registry.suse.com/suse/git:%%git_version%%-%RELEASE%"
LABEL org.openbuildservice.disturl="%DISTURL%"
LABEL com.suse.supportlevel="techpreview"
LABEL com.suse.eula="sle-eula"
LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle#suse-linux-enterprise-server-15"
LABEL com.suse.release-stage="beta"
# endlabelprefix
LABEL io.artifacthub.package.readme-url="%SOURCEURL%/README.md"
6 changes: 3 additions & 3 deletions git-image/_service
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
31 changes: 0 additions & 31 deletions git-image/config.sh

This file was deleted.

5 changes: 5 additions & 0 deletions git-image/git-image.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jan 20 08:48:20 UTC 2025 - SUSE Update Bot <[email protected]>

- Convert container image to Dockerfile

-------------------------------------------------------------------
Wed Jan 1 14:14:20 UTC 2025 - SUSE Update Bot <[email protected]>

Expand Down
68 changes: 0 additions & 68 deletions git-image/git-image.kiwi

This file was deleted.

0 comments on commit 722e925

Please sign in to comment.