Dockerfile

@@ -13,22 +13,21 @@
 # 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/bci/python:%%py310_ver%%-%RELEASE%
-#!BuildTag: opensuse/bci/python:%%py310_ver%%
 #!BuildTag: opensuse/bci/python:3.10
+#!BuildTag: opensuse/bci/python:3.10-%RELEASE%
 #!BuildTag: opensuse/bci/python:3
+#!BuildTag: opensuse/bci/python:3-%RELEASE%
+#!BuildTag: opensuse/bci/python:%%py310_ver%%
+#!BuildTag: opensuse/bci/python:%%py310_ver%%-%RELEASE%
 
 FROM opensuse/tumbleweed:latest
 
-RUN set -euo pipefail; \
+RUN set -euo pipefail; zypper -n in --no-recommends python310-devel python310 python310-pip curl findutils gawk git-core procps util-linux python310-wheel python310-pipx; zypper -n clean; rm -rf /var/log/{lastlog,tallylog,zypper.log,zypp/history,YaST2}
-    zypper -n install --no-recommends python310-devel python310 python310-pip curl findutils gawk git-core procps util-linux python310-wheel python310-pipx; \
-    zypper -n clean; \
-    rm -rf {/target,}/var/log/{alternatives.log,lastlog,tallylog,zypper.log,zypp/history,YaST2}
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.python
+LABEL org.opencontainers.image.authors="openSUSE (https://www.opensuse.org/)"
 LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Python 3.10 development"
 LABEL org.opencontainers.image.description="Python 3.10 development container based on the openSUSE Tumbleweed Base Container Image."
 LABEL org.opencontainers.image.version="%%py310_ver%%"
@@ -36,8 +35,8 @@ 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="%%py310_ver%%-%RELEASE%"
+LABEL org.opencontainers.image.ref.name="3.10-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/python:%%py310_ver%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/python:3.10-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

_service

@@ -1,12 +1,12 @@
 <services>
   <service mode="buildtime" name="docker_label_helper"/>
   <service mode="buildtime" name="kiwi_metainfo_helper"/>
-  <service mode="buildtime" name="replace_using_package_version">
+  <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%py310_ver%%</param>
     <param name="package">python310-base</param>
   </service>
-  <service mode="buildtime" name="replace_using_package_version">
+  <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%pip_ver%%</param>
     <param name="package">python310-pip</param>

python-3.10-image.changes

@@ -1,48 +1,3 @@
--------------------------------------------------------------------
-Tue Dec  3 13:26:37 UTC 2024 - SUSE Update Bot <bci-internal@suse.de>
-
-- Change attribute order in _service
-
--------------------------------------------------------------------
-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:36:16 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- rerender installation step in multiple lines, allow uninstalling optional packages
-
--------------------------------------------------------------------
-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
-
--------------------------------------------------------------------
-Thu Sep 12 10:37:22 UTC 2024 - Dirk Mueller <dmueller@suse.com>
-
-- set useobsrepositories explicitly
-
 -------------------------------------------------------------------
 Fri Sep  6 11:30:01 UTC 2024 - Dirk Mueller <dmueller@suse.com>