Merge pull request #585 from SUSE/for-deploy-Tumbleweed

🤖: Update build recipes for Tumbleweed
SUSE · Aug 18, 2023 · f804926 · f804926
2 parents 1013e5b + a144964
commit f804926
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 23 deletions.
diff --git a/.obs/workflows.yml b/.obs/workflows.yml
@@ -61,10 +61,6 @@ staging_build:
         source_project: home:defolos:BCI:CR:Tumbleweed
         source_package: golang-stable-image
         target_project: home:defolos:BCI:CR:Tumbleweed:Staging
-    - branch_package:
-        source_project: home:defolos:BCI:CR:Tumbleweed
-        source_package: golang-unstable-image
-        target_project: home:defolos:BCI:CR:Tumbleweed:Staging
     - branch_package:
         source_project: home:defolos:BCI:CR:Tumbleweed
         source_package: ruby-3.2-image
@@ -215,9 +211,6 @@ refresh_devel_BCI:
     - trigger_services:
         project: devel:BCI:Tumbleweed
         package: golang-stable-image
-    - trigger_services:
-        project: devel:BCI:Tumbleweed
-        package: golang-unstable-image
     - trigger_services:
         project: devel:BCI:Tumbleweed
         package: ruby-3.2-image

diff --git a/golang-oldstable-image/Dockerfile b/golang-oldstable-image/Dockerfile
@@ -1,30 +1,30 @@
 # SPDX-License-Identifier: MIT
 #!BuildTag: opensuse/bci/golang:oldstable
 #!BuildTag: opensuse/bci/golang:oldstable-2.%RELEASE%
-#!BuildTag: opensuse/bci/golang:1.19
-#!BuildTag: opensuse/bci/golang:1.19-2.%RELEASE%
+#!BuildTag: opensuse/bci/golang:1.20
+#!BuildTag: opensuse/bci/golang:1.20-2.%RELEASE%
 
 FROM opensuse/tumbleweed:latest
 
 MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.golang
-LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Golang 1.19"
-LABEL org.opencontainers.image.description="Golang 1.19 container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="1.19"
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Golang 1.20"
+LABEL org.opencontainers.image.description="Golang 1.20 container based on the openSUSE Tumbleweed Base Container Image."
+LABEL org.opencontainers.image.version="1.20"
 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.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:1.19-2.%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:1.20-2.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
 LABEL org.opensuse.release-stage="released"
 
 # endlabelprefix
 
-RUN set -euo pipefail; zypper -n in --no-recommends go1.19 go1.19-doc go1.19-race make git-core; zypper -n clean; rm -rf /var/log/*
+RUN set -euo pipefail; zypper -n in --no-recommends go1.20 go1.20-doc go1.20-race make git-core; zypper -n clean; rm -rf /var/log/*
 ENV GOLANG_VERSION="%%golang_version%%"
 ENV GOPATH="/go"
 ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

diff --git a/golang-oldstable-image/_service b/golang-oldstable-image/_service
@@ -4,6 +4,6 @@
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
-    <param name="package">go1.19</param>
+    <param name="package">go1.20</param>
   </service>
 </services>
diff --git a/golang-oldstable-image/golang-oldstable-image.changes b/golang-oldstable-image/golang-oldstable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 17 13:41:09 UTC 2023 - Dirk Mueller <[email protected]>
+
+- go 1.21 is now stable, go 1.20 is now oldstable
+
 -------------------------------------------------------------------
 Tue Aug  8 06:51:38 UTC 2023 - Dirk Mueller <[email protected]>
 

diff --git a/golang-stable-image/Dockerfile b/golang-stable-image/Dockerfile
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: MIT
 #!BuildTag: opensuse/bci/golang:stable
 #!BuildTag: opensuse/bci/golang:stable-1.%RELEASE%
-#!BuildTag: opensuse/bci/golang:1.20
-#!BuildTag: opensuse/bci/golang:1.20-1.%RELEASE%
+#!BuildTag: opensuse/bci/golang:1.21
+#!BuildTag: opensuse/bci/golang:1.21-1.%RELEASE%
 #!BuildTag: opensuse/bci/golang:latest
 
 FROM opensuse/tumbleweed:latest
@@ -11,21 +11,21 @@ MAINTAINER openSUSE (https://www.opensuse.org/)
 
 # Define labels according to https://en.opensuse.org/Building_derived_containers
 # labelprefix=org.opensuse.bci.golang
-LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Golang 1.20"
-LABEL org.opencontainers.image.description="Golang 1.20 container based on the openSUSE Tumbleweed Base Container Image."
-LABEL org.opencontainers.image.version="1.20"
+LABEL org.opencontainers.image.title="openSUSE Tumbleweed BCI Golang 1.21"
+LABEL org.opencontainers.image.description="Golang 1.21 container based on the openSUSE Tumbleweed Base Container Image."
+LABEL org.opencontainers.image.version="1.21"
 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.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:1.20-1.%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/golang:1.21-1.%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime"
 LABEL org.opensuse.release-stage="released"
 
 # endlabelprefix
 
-RUN set -euo pipefail; zypper -n in --no-recommends go1.20 go1.20-doc go1.20-race make git-core; zypper -n clean; rm -rf /var/log/*
+RUN set -euo pipefail; zypper -n in --no-recommends go1.21 go1.21-doc go1.21-race make git-core; zypper -n clean; rm -rf /var/log/*
 ENV GOLANG_VERSION="%%golang_version%%"
 ENV GOPATH="/go"
 ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

diff --git a/golang-stable-image/_service b/golang-stable-image/_service
@@ -4,6 +4,6 @@
   <service name="replace_using_package_version" mode="buildtime">
     <param name="file">Dockerfile</param>
     <param name="regex">%%golang_version%%</param>
-    <param name="package">go1.20</param>
+    <param name="package">go1.21</param>
   </service>
 </services>
diff --git a/golang-stable-image/golang-stable-image.changes b/golang-stable-image/golang-stable-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 17 13:41:09 UTC 2023 - Dirk Mueller <[email protected]>
+
+- go 1.21 is now stable, go 1.20 is now oldstable
+
 -------------------------------------------------------------------
 Tue Aug  8 06:51:38 UTC 2023 - Dirk Mueller <[email protected]>