(actions)(docker) default base is u22

tue-robotics · Sep 19, 2023 · fe640ad · fe640ad
1 parent dfe5525
commit fe640ad
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,10 +37,10 @@ jobs:
           - ros-distro: noetic
             ros-version: 1
             platform: "amd64"
+            base-image: "ubuntu:20.04"
           - ros-distro: humble
             ros-version: 2
             platform: "amd64"
-            base-image: "ubuntu:22.04"
           - ros-distro: rolling
             ros-version: 2
             platform: "amd64"

diff --git a/ci/build-docker-image.sh b/ci/build-docker-image.sh
@@ -102,7 +102,7 @@ echo -e "\e[35;1mCI_TARGETS_REPO       = ${CI_TARGETS_REPO}\e[0m"
 [[ -z "$CI_DOCKER_LOGIN" ]] && CI_DOCKER_LOGIN="false"
 echo -e "\e[35;1mCI_DOCKER_LOGIN       = ${CI_DOCKER_LOGIN}\e[0m"
 
-[[ -z "$CI_DOCKER_BASE_IMAGE" ]] && CI_DOCKER_BASE_IMAGE="ubuntu:20.04"
+[[ -z "$CI_DOCKER_BASE_IMAGE" ]] && CI_DOCKER_BASE_IMAGE="ubuntu:22.04"
 echo -e "\e[35;1mCI_DOCKER_BASE_IMAGE  = ${CI_DOCKER_BASE_IMAGE}\e[0m"
 
 echo -e "\e[35;1mCI_DOCKER_REGISTRY    = ${CI_DOCKER_REGISTRY}\e[0m"

diff --git a/dockerfiles/tue-env.Dockerfile b/dockerfiles/tue-env.Dockerfile
@@ -3,8 +3,8 @@
 #       Dockerfile to build working Ubuntu image with tue-env
 # ----------------------------------------------------------------
 
-# Set default base image to Ubuntu 20.04
-ARG BASE_IMAGE=ubuntu:20.04
+# Set default base image to Ubuntu 22.04
+ARG BASE_IMAGE=ubuntu:22.04
 FROM $BASE_IMAGE as base
 
 # ----------------------------------------------------------------