Skip to content

Commit 2e1d523

Browse files
Ubuntu focal(20.04) EOL changes in features test scripts (#1370)
* Ubuntu focal(20.04) EOL changes in features test scripts * Version bump and dotnet rollback. * Reverting the version bump & adding test for Oryx test script. --------- Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
1 parent 14a4c4c commit 2e1d523

File tree

22 files changed

+135
-89
lines changed

22 files changed

+135
-89
lines changed

src/git/install.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,12 @@ elif [ "${ADJUSTED_ID}" = "rhel" ]; then
270270
if ! type curl > /dev/null 2>&1; then
271271
check_packages curl
272272
fi
273+
if ! type cmp > /dev/null 2>&1; then
274+
check_packages diffutils
275+
fi
276+
if ! type awk > /dev/null 2>&1; then
277+
check_packages gawk
278+
fi
273279
if [ $ID = "mariner" ]; then
274280
check_packages glibc-devel kernel-headers binutils
275281
fi

test/_global/scenarios.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"all_the_clis": {
3-
"image": "ubuntu:focal",
3+
"image": "ubuntu:noble",
44
"features": {
55
"aws-cli": {},
66
"azure-cli": {},
77
"github-cli": {}
88
}
99
},
1010
"node_java_rust": {
11-
"image": "ubuntu:focal",
11+
"image": "ubuntu:noble",
1212
"features": {
1313
"node": {},
1414
"java": {},
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:focal
1+
FROM ubuntu:noble
22

33
RUN groupadd customUser -g 30000 && \
44
useradd customUser -u 30000 -g 30000 --create-home --home-dir /customHome
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
FROM ubuntu:focal
1+
FROM ubuntu:noble
22

33
COPY meta.env /usr/local/etc/dev-containers/meta.env
4+
5+
RUN if id "ubuntu" &>/dev/null; then \
6+
echo "Deleting user 'ubuntu' for noble" && userdel -f -r ubuntu || echo "Failed to delete ubuntu user for noble"; \
7+
else \
8+
echo "User 'ubuntu' does not exist for noble"; \
9+
fi

test/common-utils/noble.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
3+
set -e
4+
5+
# Optional: Import test library
6+
source dev-container-features-test-lib
7+
8+
# Definition specific tests
9+
. /etc/os-release
10+
check "non-root user" test "$(whoami)" = "devcontainer"
11+
check "distro" test "${VERSION_CODENAME}" = "noble"
12+
13+
# Report result
14+
reportResults
15+

test/common-utils/scenarios.json

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
{
2-
"bionic": {
3-
"image": "ubuntu:bionic",
4-
"remoteUser": "devcontainer",
5-
"features": {
6-
"common-utils": {}
7-
}
8-
},
9-
"focal": {
10-
"image": "ubuntu:focal",
2+
"jammy": {
3+
"image": "ubuntu:jammy",
114
"remoteUser": "devcontainer",
125
"features": {
136
"common-utils": {}
147
}
158
},
16-
"jammy": {
17-
"image": "ubuntu:jammy",
9+
"noble": {
10+
"image": "ubuntu:noble",
1811
"remoteUser": "devcontainer",
1912
"features": {
2013
"common-utils": {}
2114
}
22-
},
15+
},
2316
"buster": {
2417
"image": "debian:buster",
2518
"remoteUser": "devcontainer",

test/conda/scenarios.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"install_conda": {
3-
"image": "ubuntu:focal",
3+
"image": "ubuntu:noble",
44
"features": {
55
"conda": {
66
"version": "4.12.0",

test/docker-in-docker/docker_specific_moby_buildx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
# Optional: Import test library
66
source dev-container-features-test-lib
77
# Definition specific tests
8-
check "moby-buildx" bash -c "dpkg-query -W moby-buildx | grep -E '0.12.0'"
8+
check "moby-buildx" bash -c "dpkg-query -W moby-buildx | grep -E '0.14.0'"
99

1010
check "docker-buildx" bash -c "docker buildx version"
1111
check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"

test/docker-in-docker/scenarios.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"docker_build_fallback_compose": {
3-
"image": "ubuntu:focal",
3+
"image": "ubuntu:noble",
44
"features": {
55
"docker-in-docker": {
66
"version": "latest",
@@ -9,7 +9,7 @@
99
}
1010
},
1111
"dockerIp6tablesDisabledTest": {
12-
"image": "ubuntu:focal",
12+
"image": "ubuntu:noble",
1313
"features": {
1414
"docker-in-docker": {
1515
"version": "27.0.3",
@@ -56,7 +56,7 @@
5656
"remoteUser": "node"
5757
},
5858
"docker_build_2": {
59-
"image": "ubuntu:focal",
59+
"image": "ubuntu:noble",
6060
"features": {
6161
"docker-in-docker": {
6262
"version": "latest",
@@ -106,7 +106,7 @@
106106
}
107107
},
108108
"docker_compose_v1": {
109-
"image": "mcr.microsoft.com/devcontainers/base:focal",
109+
"image": "mcr.microsoft.com/devcontainers/base:noble",
110110
"features": {
111111
"docker-in-docker": {
112112
"moby": true,
@@ -116,7 +116,7 @@
116116
}
117117
},
118118
"docker_compose_v2": {
119-
"image": "mcr.microsoft.com/devcontainers/base:focal",
119+
"image": "mcr.microsoft.com/devcontainers/base:noble",
120120
"features": {
121121
"docker-in-docker": {
122122
"moby": true,
@@ -126,7 +126,7 @@
126126
}
127127
},
128128
"docker_build_fallback_buildx": {
129-
"image": "ubuntu:focal",
129+
"image": "ubuntu:noble",
130130
"features": {
131131
"docker-in-docker": {
132132
"version": "latest",
@@ -135,10 +135,10 @@
135135
}
136136
},
137137
"docker_specific_moby_buildx": {
138-
"image": "ubuntu:focal",
138+
"image": "ubuntu:noble",
139139
"features": {
140140
"docker-in-docker": {
141-
"mobyBuildxVersion": "0.12.0"
141+
"mobyBuildxVersion": "0.14.0"
142142
}
143143
}
144144
},

test/docker-outside-of-docker/docker_specific_moby_buildx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
# Optional: Import test library
66
source dev-container-features-test-lib
77
# Definition specific tests
8-
check "moby-buildx" bash -c "dpkg-query -W moby-buildx | grep -E '0.12.0'"
8+
check "moby-buildx" bash -c "dpkg-query -W moby-buildx | grep -E '0.14.0'"
99

1010
check "docker-buildx" bash -c "docker buildx version"
1111
check "docker-buildx-path" bash -c "ls -la /usr/libexec/docker/cli-plugins/docker-buildx"

0 commit comments

Comments
 (0)