Upgrade golang to 1.19 and migrate to bullseye

microsoft · Aug 24, 2022 · ae3b0e7 · ae3b0e7
1 parent 031ab11
commit ae3b0e7
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 14 deletions.
diff --git a/build/__golangVersions.sh b/build/__golangVersions.sh
@@ -6,3 +6,5 @@ GOLANG17_VERSION='1.17'
 GOLANG17_TAR_SHA256='6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d'
 GOLANG18_VERSION='1.18'
 GOLANG18_TAR_SHA256='e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f'
+GOLANG19_VERSION='1.19'
+GOLANG19_TAR_SHA256='464b6b66591f6cf055bc5df90a9750bf5fbc9d038722bb84a9d56a2bea974be6'
diff --git a/build/buildBuildImages.sh b/build/buildBuildImages.sh
@@ -471,6 +471,7 @@ if [ -z "$imageTypeToBuild" ]; then
 	buildCliImage
 	buildBuildPackImage
 	buildFullImage "buster"
+	buildFullImage "bullseye"
 elif [ "$imageTypeToBuild" == "githubactions" ]; then
 	buildGitHubActionsImage
 	buildGitHubActionsImage "buster"
@@ -498,8 +499,11 @@ elif [ "$imageTypeToBuild" == "ltsversions-buster" ]; then
 	buildLtsVersionsImage "buster"
 elif [ "$imageTypeToBuild" == "latest" ]; then
 	buildLatestImages
-elif [ "$imageTypeToBuild" == "full" ]; then
-	buildFullImage "buster"
+elif [ "$imageTypeToBuild" == "full-bullseye" ]; then
+    echo "entering here"
+	buildFullImage "bullseye"
+elif ["$imageTypeToBuild" == "full-buster"]; then
+    buildFullImage "buster"
 elif [ "$imageTypeToBuild" == "vso-focal" ]; then
 	buildVsoFocalImage
 elif [ "$imageTypeToBuild" == "cli" ]; then

diff --git a/build/constants.yaml b/build/constants.yaml
@@ -111,6 +111,8 @@
     golang17-tar-sha256: 6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d
     golang18-version: 1.18
     golang18-tar-sha256: e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f
+    golang19-version: 1.19
+    golang19-tar-sha256: 464b6b66591f6cf055bc5df90a9750bf5fbc9d038722bb84a9d56a2bea974be6
   outputs:
     - type: csharp
       directory: src/BuildScriptGenerator

diff --git a/doc/supportedPlatformVersions.md b/doc/supportedPlatformVersions.md
@@ -220,6 +220,7 @@
 - 1.16.7
 - 1.17
 - 1.18
+- 1.19
 
 ### buster
 
@@ -228,6 +229,7 @@
 - 1.16.7
 - 1.17
 - 1.18
+- 1.19
 
 ### focal-scm
 
@@ -236,6 +238,7 @@
 - 1.16.7
 - 1.17
 - 1.18
+- 1.19
 
 ### stretch
 

diff --git a/images/build/Dockerfiles/full.Dockerfile b/images/build/Dockerfiles/full.Dockerfile
@@ -2,7 +2,7 @@ ARG DEBIAN_FLAVOR
 
 ### oryx run-script image
 # DisableDockerDetector "Below image not yet supported in the Docker Hub mirror"
-FROM golang:1.15-${DEBIAN_FLAVOR} as startupScriptGens
+FROM golang:1.19-${DEBIAN_FLAVOR} as startupScriptGens
 
 # GOPATH is set to "/go" in the base image
 WORKDIR /go/src
@@ -27,21 +27,21 @@ COPY --from=oryxdevmcr.azurecr.io/private/oryx/support-files-image-for-build /tm
 COPY --from=oryxdevmcr.azurecr.io/private/oryx/buildscriptgenerator /opt/ /opt/
 COPY --from=startupScriptGens /opt/startupcmdgen/ /opt/startupcmdgen/
 
-RUN if [ "${DEBIAN_FLAVOR}" = "buster" ]; then \
+RUN if [ "${DEBIAN_FLAVOR}" = "bullseye" ]; then \
+       echo "here!!"
         apt-get update \
         && apt-get install -y --no-install-recommends \
-            libicu63 \
+            libicu67 \
             libcurl4 \
             libssl1.1 \
         && rm -rf /var/lib/apt/lists/* ; \
     else \
-        apt-get update \
+      apt-get update \
         && apt-get install -y --no-install-recommends \
-            libcurl3 \
-            libicu57 \
-            liblttng-ust0 \
-            libssl1.0.2 \
-        && rm -rf /var/lib/apt/lists/* ; \
+            libicu63 \
+            libcurl4 \
+            libssl1.1 \
+             && rm -rf /var/lib/apt/lists/* ; \
     fi
 
 RUN apt-get update \

diff --git a/platforms/golang/versions/bullseye/versionsToBuild.txt b/platforms/golang/versions/bullseye/versionsToBuild.txt
@@ -3,4 +3,5 @@
 1.15.15, 0885cf046a9f099e260d98d9ec5d19ea9328f34c8dc4956e1d3cd87daaddb345,
 1.16.7, 7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04, 
 1.17, 6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d, 
-1.18, e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f,
+1.18, e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f,
+1.19, 464b6b66591f6cf055bc5df90a9750bf5fbc9d038722bb84a9d56a2bea974be6
diff --git a/platforms/golang/versions/buster/versionsToBuild.txt b/platforms/golang/versions/buster/versionsToBuild.txt
@@ -3,4 +3,5 @@
 1.15.15, 0885cf046a9f099e260d98d9ec5d19ea9328f34c8dc4956e1d3cd87daaddb345,
 1.16.7, 7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04, 
 1.17, 6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d, 
-1.18, e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f,
+1.18, e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f,
+1.19, 464b6b66591f6cf055bc5df90a9750bf5fbc9d038722bb84a9d56a2bea974be6
diff --git a/platforms/golang/versions/focal-scm/versionsToBuild.txt b/platforms/golang/versions/focal-scm/versionsToBuild.txt
@@ -3,4 +3,5 @@
 1.15.15, 0885cf046a9f099e260d98d9ec5d19ea9328f34c8dc4956e1d3cd87daaddb345,
 1.16.7, 7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04, 
 1.17, 6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d, 
-1.18, e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f,
+1.18, e85278e98f57cdb150fe8409e6e5df5343ecb13cebf03a5d5ff12bd55a80264f,
+1.19, 464b6b66591f6cf055bc5df90a9750bf5fbc9d038722bb84a9d56a2bea974be6