Skip to content

Commit 9bbf12a

Browse files
author
Andrei Neagu
committed
swapped base for ubuntu:24.04
1 parent ab6027d commit 9bbf12a

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

Dockerfile

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
1-
FROM nvidia/cudagl:10.2-runtime-ubuntu18.04
1+
FROM ubuntu:24.04
22

33
LABEL maintainer="neagu@itis.swiss"
44
LABEL org.opencontainers.image.authors="neagu@itis.swiss"
55
LABEL org.opencontainers.image.source="https://github.com/ITISFoundation/ci-service-integration-library"
66
LABEL org.opencontainers.image.licenses="MIT"
7-
ARG DEBIAN_FRONTEND=noninteractive
8-
9-
10-
# Fixes issues with nvidia keys suddenly gone missing
11-
# TODO: check if can be removed
12-
RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub 18
13-
RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
147

158
#Set of all dependencies needed for pyenv to work on Ubuntu
169
RUN apt-get update && \
@@ -40,17 +33,20 @@ RUN apt-get update && \
4033
jq
4134

4235
# NOTE: keep in sync with the version installed in the dynamic-sidecar
43-
ARG DOCKER_COMPOSE_VERSION="2.27.1"
36+
ARG DOCKER_COMPOSE_VERSION="2.38.2"
37+
ARG UBUNTU_DOCKER_VERSION=5:28.3.1-1~ubuntu.24.04~noble
4438
# install Docker
45-
RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg && \
39+
RUN apt-get update && \
40+
apt-get install ca-certificates curl && \
41+
install -m 0755 -d /etc/apt/keyrings && \
42+
curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc && \
43+
chmod a+r /etc/apt/keyrings/docker.asc && \
4644
echo \
47-
"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu \
48-
$(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null && \
45+
"deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
46+
$(. /etc/os-release && echo "${UBUNTU_CODENAME:-$VERSION_CODENAME}") stable" | \
47+
tee /etc/apt/sources.list.d/docker.list > /dev/null && \
4948
apt-get update && \
50-
apt-get install -y --no-install-recommends \
51-
docker-ce \
52-
containerd.io \
53-
docker-ce-cli && \
49+
apt-get install -y docker-ce=$UBUNTU_DOCKER_VERSION docker-ce-cli=$UBUNTU_DOCKER_VERSION containerd.io docker-buildx-plugin && \
5450
mkdir -p /usr/local/lib/docker/cli-plugins && \
5551
curl -SL https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && \
5652
chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \

0 commit comments

Comments
 (0)