diff --git a/.github/workflows/docker-build-test-upload.yml b/.github/workflows/docker-build-test-upload.yml index c1fcae987a..7d9834f866 100644 --- a/.github/workflows/docker-build-test-upload.yml +++ b/.github/workflows/docker-build-test-upload.yml @@ -77,9 +77,9 @@ jobs: platform: ${{ inputs.platform }} variant: ${{ inputs.parent-variant }} - - name: Pull ubuntu:22.04 image 📥 + - name: Pull ubuntu:24.04 image 📥 if: inputs.parent-image == '' - run: docker pull ubuntu:22.04 + run: docker pull ubuntu:24.04 shell: bash - name: Build image 🛠 diff --git a/Makefile b/Makefile index 98fa4d6578..51ea5233d2 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ help: build/%: DOCKER_BUILD_ARGS?= -build/%: ROOT_CONTAINER?=ubuntu:22.04 +build/%: ROOT_CONTAINER?=ubuntu:24.04 build/%: ## build the latest image for a stack using the system's architecture docker build $(DOCKER_BUILD_ARGS) --rm --force-rm --tag "$(REGISTRY)/$(OWNER)/$(notdir $@):latest" "./images/$(notdir $@)" --build-arg REGISTRY="$(REGISTRY)" --build-arg OWNER="$(OWNER)" @echo -n "Built image size: " diff --git a/images/docker-stacks-foundation/Dockerfile b/images/docker-stacks-foundation/Dockerfile index 84d57235e9..92a5d285da 100644 --- a/images/docker-stacks-foundation/Dockerfile +++ b/images/docker-stacks-foundation/Dockerfile @@ -1,9 +1,9 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -# Ubuntu 22.04 (jammy) -# https://hub.docker.com/_/ubuntu/tags?page=1&name=jammy -ARG ROOT_CONTAINER=ubuntu:22.04 +# Ubuntu 24.04 (noble) +# https://hub.docker.com/_/ubuntu/tags?page=1&name=noble +ARG ROOT_CONTAINER=ubuntu:24.04 FROM $ROOT_CONTAINER @@ -73,6 +73,8 @@ RUN sed -i 's/^#force_color_prompt=yes/force_color_prompt=yes/' /etc/skel/.bashr RUN echo "auth requisite pam_deny.so" >> /etc/pam.d/su && \ sed -i.bak -e 's/^%admin/#%admin/' /etc/sudoers && \ sed -i.bak -e 's/^%sudo/#%sudo/' /etc/sudoers && \ + # Delete existing user 'ubuntu' with UID=1000 + userdel -Rz ubuntu && \ useradd --no-log-init --create-home --shell /bin/bash --uid "${NB_UID}" --no-user-group "${NB_USER}" && \ mkdir -p "${CONDA_DIR}" && \ chown "${NB_USER}:${NB_GID}" "${CONDA_DIR}" && \