Skip to content

Commit 25a9b32

Browse files
authored
Upgrade to Ubuntu 22 (#61213)
* Upgrade to Ubuntu 22 * Update install-nginx-linux.sh
1 parent d0cee22 commit 25a9b32

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ jobs:
109109
vmImage: macOS-13
110110
${{ if eq(parameters.agentOs, 'Linux') }}:
111111
${{ if eq(parameters.useHostedUbuntu, true) }}:
112-
vmImage: ubuntu-20.04
112+
vmImage: ubuntu-22.04
113113
${{ else }}:
114114
name: $(DncEngPublicBuildPool)
115-
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
115+
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
116116
${{ if eq(parameters.agentOs, 'Windows') }}:
117117
name: $(DncEngPublicBuildPool)
118118
demands: ImageOverride -equals windows.vs2022preview.amd64.open
@@ -325,7 +325,7 @@ jobs:
325325
os: macOS
326326
${{ if eq(parameters.agentOs, 'Linux') }}:
327327
name: $(DncEngInternalBuildPool)
328-
image: 1es-ubuntu-2004
328+
image: 1es-ubuntu-2204
329329
os: linux
330330
${{ if eq(parameters.agentOs, 'Windows') }}:
331331
name: $(DncEngInternalBuildPool)

eng/scripts/install-nginx-linux.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
66
reporoot="$(dirname "$(dirname "$scriptroot")")"
77
nginxinstall="$reporoot/.tools/nginx"
88

9-
curl -sSL http://nginx.org/download/nginx-1.14.2.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.14.2/
9+
curl -sSL http://nginx.org/download/nginx-1.26.3.tar.gz --retry 5 | tar zxfv - -C /tmp && cd /tmp/nginx-1.26.3/
1010
./configure --prefix=$nginxinstall --with-http_ssl_module --without-http_rewrite_module
1111
make
1212
make install

0 commit comments

Comments
 (0)