Explorar o código

[release/9.0] Upgrade to Ubuntu 22 (#61215)

* Upgrade to Ubuntu 22

* Update install-nginx-linux.sh

---------

Co-authored-by: William Godbe <[email protected]>
github-actions[bot] hai 11 meses
pai
achega
e1cae2719f

+ 3 - 3
.azure/pipelines/jobs/default-build.yml

@@ -109,10 +109,10 @@ jobs:
           vmImage: macOS-13
           vmImage: macOS-13
         ${{ if eq(parameters.agentOs, 'Linux') }}:
         ${{ if eq(parameters.agentOs, 'Linux') }}:
           ${{ if eq(parameters.useHostedUbuntu, true) }}:
           ${{ if eq(parameters.useHostedUbuntu, true) }}:
-            vmImage: ubuntu-20.04
+            vmImage: ubuntu-22.04
           ${{ else }}:
           ${{ else }}:
             name: $(DncEngPublicBuildPool)
             name: $(DncEngPublicBuildPool)
-            demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
+            demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
         ${{ if eq(parameters.agentOs, 'Windows') }}:
         ${{ if eq(parameters.agentOs, 'Windows') }}:
           name: $(DncEngPublicBuildPool)
           name: $(DncEngPublicBuildPool)
           demands: ImageOverride -equals windows.vs2022preview.amd64.open
           demands: ImageOverride -equals windows.vs2022preview.amd64.open
@@ -327,7 +327,7 @@ jobs:
           os: macOS
           os: macOS
         ${{ if eq(parameters.agentOs, 'Linux') }}:
         ${{ if eq(parameters.agentOs, 'Linux') }}:
           name: $(DncEngInternalBuildPool)
           name: $(DncEngInternalBuildPool)
-          image: 1es-ubuntu-2004
+          image: 1es-ubuntu-2204
           os: linux
           os: linux
         ${{ if eq(parameters.agentOs, 'Windows') }}:
         ${{ if eq(parameters.agentOs, 'Windows') }}:
           name: $(DncEngInternalBuildPool)
           name: $(DncEngInternalBuildPool)

+ 1 - 1
eng/scripts/install-nginx-linux.sh

@@ -6,7 +6,7 @@ scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 reporoot="$(dirname "$(dirname "$scriptroot")")"
 reporoot="$(dirname "$(dirname "$scriptroot")")"
 nginxinstall="$reporoot/.tools/nginx"
 nginxinstall="$reporoot/.tools/nginx"
 
 
-curl -sSL http://nginx.org/download/nginx-1.14.2.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.14.2/
+curl -sSL http://nginx.org/download/nginx-1.26.3.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.26.3/
 ./configure --prefix=$nginxinstall --with-http_ssl_module --without-http_rewrite_module
 ./configure --prefix=$nginxinstall --with-http_ssl_module --without-http_rewrite_module
 make
 make
 make install
 make install