Merge pull request #675 from SUSE/for-deploy-6

🤖: Update build recipes for SP6
SUSE · Sep 28, 2023 · c5e8cfa · c5e8cfa
2 parents ca960ac + 530f396
commit c5e8cfa
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 10 deletions.
diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
@@ -11,8 +11,8 @@ MAINTAINER SUSE LLC (https://www.suse.com/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.golang
-LABEL org.opencontainers.image.title="SLE BCI Golang 1.20"
-LABEL org.opencontainers.image.description="Golang 1.20 container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.title="SLE BCI Go 1.20 development"
+LABEL org.opencontainers.image.description="Go 1.20 development container based on the SLE Base Container Image."
 LABEL org.opencontainers.image.version="1.20"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"

diff --git a/golang-oldstable-image/golang-oldstable-image.changes b/golang-oldstable-image/golang-oldstable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 28 12:01:53 UTC 2023 - Dirk Mueller <[email protected]>
+
+- correct descriptions to be more consistent
+
 -------------------------------------------------------------------
 Thu Sep 28 10:32:14 UTC 2023 - Dirk Mueller <[email protected]>
 

diff --git a/golang-oldstable-openssl-image/Dockerfile b/golang-oldstable-openssl-image/Dockerfile
@@ -11,8 +11,8 @@ MAINTAINER SUSE LLC (https://www.suse.com/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.golang
-LABEL org.opencontainers.image.title="SLE BCI Golang 1.19-openssl"
-LABEL org.opencontainers.image.description="Golang 1.19-openssl container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.title="SLE BCI Go 1.19-openssl development"
+LABEL org.opencontainers.image.description="Go 1.19-openssl development container based on the SLE Base Container Image."
 LABEL org.opencontainers.image.version="1.19-openssl"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"

diff --git a/golang-oldstable-openssl-image/golang-oldstable-openssl-image.changes b/golang-oldstable-openssl-image/golang-oldstable-openssl-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 28 12:01:53 UTC 2023 - Dirk Mueller <[email protected]>
+
+- correct descriptions to be more consistent
+
 -------------------------------------------------------------------
 Thu Sep 28 10:32:14 UTC 2023 - Dirk Mueller <[email protected]>
 

diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -11,8 +11,8 @@ MAINTAINER SUSE LLC (https://www.suse.com/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.golang
-LABEL org.opencontainers.image.title="SLE BCI Golang 1.21"
-LABEL org.opencontainers.image.description="Golang 1.21 container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.title="SLE BCI Go 1.21 development"
+LABEL org.opencontainers.image.description="Go 1.21 development container based on the SLE Base Container Image."
 LABEL org.opencontainers.image.version="1.21"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"

diff --git a/golang-stable-image/golang-stable-image.changes b/golang-stable-image/golang-stable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 28 12:01:53 UTC 2023 - Dirk Mueller <[email protected]>
+
+- correct descriptions to be more consistent
+
 -------------------------------------------------------------------
 Thu Sep 28 10:32:14 UTC 2023 - Dirk Mueller <[email protected]>
 

diff --git a/golang-stable-openssl-image/Dockerfile b/golang-stable-openssl-image/Dockerfile
@@ -11,8 +11,8 @@ MAINTAINER SUSE LLC (https://www.suse.com/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=com.suse.bci.golang
-LABEL org.opencontainers.image.title="SLE BCI Golang 1.20-openssl"
-LABEL org.opencontainers.image.description="Golang 1.20-openssl container based on the SLE Base Container Image."
+LABEL org.opencontainers.image.title="SLE BCI Go 1.20-openssl development"
+LABEL org.opencontainers.image.description="Go 1.20-openssl development container based on the SLE Base Container Image."
 LABEL org.opencontainers.image.version="1.20-openssl"
 LABEL org.opencontainers.image.url="https://www.suse.com/products/server/"
 LABEL org.opencontainers.image.created="%BUILDTIME%"

diff --git a/golang-stable-openssl-image/golang-stable-openssl-image.changes b/golang-stable-openssl-image/golang-stable-openssl-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 28 12:01:53 UTC 2023 - Dirk Mueller <[email protected]>
+
+- correct descriptions to be more consistent
+
 -------------------------------------------------------------------
 Thu Sep 28 10:32:14 UTC 2023 - Dirk Mueller <[email protected]>
 

diff --git a/python-3.11-image/Dockerfile b/python-3.11-image/Dockerfile
@@ -28,7 +28,7 @@ LABEL com.suse.image-type="sle-bci"
 LABEL com.suse.release-stage="beta"
 # endlabelprefix
 
-RUN set -euo pipefail; zypper -n in --no-recommends python311-devel python311 python311-pip curl git-core lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/*
+RUN set -euo pipefail; zypper -n in --no-recommends python311-devel python311 python311-pip curl git-core; zypper -n clean; rm -rf /var/log/*
 ENV PYTHON_VERSION="%%py311_ver%%"
 ENV PATH="$PATH:/root/.local/bin"
 ENV PIP_VERSION="%%pip_ver%%"

diff --git a/python-3.11-image/python-3.11-image.changes b/python-3.11-image/python-3.11-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 28 12:01:53 UTC 2023 - Dirk Mueller <[email protected]>
+
+- correct descriptions to be more consistent
+
 -------------------------------------------------------------------
 Thu Sep 28 10:32:14 UTC 2023 - Dirk Mueller <[email protected]>
 

diff --git a/python-3.6-image/Dockerfile b/python-3.6-image/Dockerfile
@@ -27,7 +27,7 @@ LABEL com.suse.image-type="sle-bci"
 LABEL com.suse.release-stage="beta"
 # endlabelprefix
 
-RUN set -euo pipefail; zypper -n in --no-recommends python3-devel python3 python3-pip curl git-core python3-wheel lifecycle-data-sle-module-development-tools; zypper -n clean; rm -rf /var/log/*
+RUN set -euo pipefail; zypper -n in --no-recommends python3-devel python3 python3-pip curl git-core python3-wheel; zypper -n clean; rm -rf /var/log/*
 ENV PYTHON_VERSION="%%py36_ver%%"
 ENV PATH="$PATH:/root/.local/bin"
 ENV PIP_VERSION="%%pip_ver%%"

diff --git a/python-3.6-image/python-3.6-image.changes b/python-3.6-image/python-3.6-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 28 12:01:53 UTC 2023 - Dirk Mueller <[email protected]>
+
+- correct descriptions to be more consistent
+
 -------------------------------------------------------------------
 Thu Sep 28 10:32:14 UTC 2023 - Dirk Mueller <[email protected]>