Trying with ubuntu 24

Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
antrea-io · Jun 27, 2024 · cb336ac · cb336ac
1 parent 0feeb68
commit cb336ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/build/images/base/build.sh b/build/images/base/build.sh
@@ -121,10 +121,10 @@ fi
 if $PULL; then
     # The ubuntu image is also used for the UBI build (for the cni-binaries intermediate image).
     if [[ ${DOCKER_REGISTRY} == "" ]]; then
-        docker pull $PLATFORM_ARG ubuntu:22.04
+        docker pull $PLATFORM_ARG ubuntu:24.04
     else
-        docker pull ${DOCKER_REGISTRY}/antrea/ubuntu:22.04
-        docker tag ${DOCKER_REGISTRY}/antrea/ubuntu:22.04 ubuntu:22.04
+        docker pull ${DOCKER_REGISTRY}/antrea/ubuntu:24.04
+        docker tag ${DOCKER_REGISTRY}/antrea/ubuntu:24.04 ubuntu:24.04
     fi
 
     if [ "$DISTRO" == "ubuntu" ]; then
@@ -154,9 +154,9 @@ function docker_build_and_push() {
     local dockerfile="$2"
     local build_args="--build-arg CNI_BINARIES_VERSION=$CNI_BINARIES_VERSION --build-arg SURICATA_VERSION=$SURICATA_VERSION --build-arg BUILD_TAG=$BUILD_TAG"
     if [ "$DISTRO" == "ubuntu" ]; then
-        local build_contexts="--build-context ubuntu=docker-image://ubuntu:22.04 --build-context antrea-openvswitch=docker-image://antrea/openvswitch:${BUILD_TAG}"
+        local build_contexts="--build-context ubuntu=docker-image://ubuntu:24.04 --build-context antrea-openvswitch=docker-image://antrea/openvswitch:${BUILD_TAG}"
     elif [ "$DISTRO" == "ubi" ]; then
-        local build_contexts="--build-context ubuntu=docker-image://ubuntu:22.04 --build-context antrea-openvswitch=docker-image://antrea/openvswitch-ubi:${BUILD_TAG}"
+        local build_contexts="--build-context ubuntu=docker-image://ubuntu:24.04 --build-context antrea-openvswitch=docker-image://antrea/openvswitch-ubi:${BUILD_TAG}"
     fi
     local cache_args=""
     if $PUSH; then

diff --git a/build/images/ovs/build.sh b/build/images/ovs/build.sh
@@ -125,16 +125,16 @@ fi
 if $PULL; then
     if [ "$DISTRO" == "ubuntu" ]; then
         if [[ ${DOCKER_REGISTRY} == "" ]]; then
-            docker pull $PLATFORM_ARG ubuntu:22.04
+            docker pull $PLATFORM_ARG ubuntu:24.04
         else
-            docker pull ${DOCKER_REGISTRY}/antrea/ubuntu:22.04
-            docker tag ${DOCKER_REGISTRY}/antrea/ubuntu:22.04 ubuntu:22.04
+            docker pull ${DOCKER_REGISTRY}/antrea/ubuntu:24.04
+            docker tag ${DOCKER_REGISTRY}/antrea/ubuntu:24.04 ubuntu:24.04
         fi
     elif [ "$DISTRO" == "ubi" ]; then
         docker pull $PLATFORM_ARG quay.io/centos/centos:stream9
         docker pull $PLATFORM_ARG registry.access.redhat.com/ubi9
     elif [ "$DISTRO" == "windows" ]; then
-        docker pull --platform linux/amd64 ubuntu:22.04
+        docker pull --platform linux/amd64 ubuntu:24.04
     fi
 fi
 
@@ -143,7 +143,7 @@ function docker_build_and_push() {
     local dockerfile="$2"
     local build_args="--build-arg OVS_VERSION=$OVS_VERSION"
     if [ "$DISTRO" == "ubuntu" ]; then
-        local build_contexts="--build-context ubuntu=docker-image://ubuntu:22.04"
+        local build_contexts="--build-context ubuntu=docker-image://ubuntu:24.04"
     elif [ "$DISTRO" == "ubi" ]; then
         local build_contexts="--build-context centos=docker-image://quay.io/centos/centos:stream9 --build-context ubi9=docker-image://registry.access.redhat.com/ubi9"
     fi