From 421111d9150b506a324f32c82b6ccb9abf7fb6c9 Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 22 Jul 2024 13:51:10 +0200 Subject: feat(infra): Ubuntu 24.04 LTS Signed-off-by: Peter Mikus Change-Id: I81e48360fcc970a16f1203955003d59f476b3233 --- fdio.infra/pxe/docker-nginx/Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'fdio.infra/pxe/docker-nginx/Dockerfile') diff --git a/fdio.infra/pxe/docker-nginx/Dockerfile b/fdio.infra/pxe/docker-nginx/Dockerfile index 64872e7a10..536d4472ac 100644 --- a/fdio.infra/pxe/docker-nginx/Dockerfile +++ b/fdio.infra/pxe/docker-nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 as ubuntu_jammy +FROM ubuntu:24.04 as ubuntu_noble LABEL Description="ubuntu intermediate image" LABEL Version="2.0" @@ -6,12 +6,12 @@ LABEL Version="2.0" RUN apt update \ && apt install -y wget -ENV ISO_JAMMY_AMD64 https://old-releases.ubuntu.com/releases/22.04.1/ubuntu-22.04.1-live-server-arm64.iso -ENV ISO_JAMMY_ARM64 https://old-releases.ubuntu.com/releases/22.04.1/ubuntu-22.04.1-live-server-arm64.iso +ENV ISO_NOBLE_AMD64 https://releases.ubuntu.com/releases/noble/ubuntu-24.04-live-server-amd64.iso +ENV ISO_NOBLE_ARM64 https://cdimage.ubuntu.com/releases/noble/release/ubuntu-24.04-live-server-arm64.iso RUN echo "Preparing ISO Pre-cache" \ - && wget $ISO_JAMMY_AMD64 -O /ubuntu-22.04.1-live-server-amd64.iso \ - && wget $ISO_JAMMY_ARM64 -O /ubuntu-22.04.1-live-server-arm64.iso + && wget $ISO_NOBLE_AMD64 -O /ubuntu-24.04-live-server-amd64.iso \ + && wget $ISO_NOBLE_ARM64 -O /ubuntu-24.04-live-server-arm64.iso FROM nginx:stable-alpine @@ -19,13 +19,13 @@ FROM nginx:stable-alpine LABEL Description="nginx service image" LABEL Version="2.0" -ENV NGINX_JAMMY_AMD64 /usr/share/nginx/html/ubuntu_jammy_amd64/ -ENV NGINX_JAMMY_ARM64 /usr/share/nginx/html/ubuntu_jammy_arm64/ +ENV NGINX_NOBLE_AMD64 /usr/share/nginx/html/ubuntu_noble_amd64/ +ENV NGINX_NOBLE_ARM64 /usr/share/nginx/html/ubuntu_noble_arm64/ -RUN mkdir -p $NGINX_JAMMY_AMD64 \ - && mkdir -p $NGINX_JAMMY_ARM64 +RUN mkdir -p $NGINX_NOBLE_AMD64 \ + && mkdir -p $NGINX_NOBLE_ARM64 -COPY --from=ubuntu_jammy /ubuntu-22.04.1-live-server-amd64.iso $NGINX_JAMMY_AMD64/ubuntu-22.04.1-live-server-amd64.iso -COPY --from=ubuntu_jammy /ubuntu-22.04.1-live-server-arm64.iso $NGINX_JAMMY_ARM64/ubuntu-22.04.1-live-server-arm64.iso +COPY --from=ubuntu_noble /ubuntu-24.04-live-server-amd64.iso $NGINX_NOBLE_AMD64/ubuntu-24.04-live-server-amd64.iso +COPY --from=ubuntu_noble /ubuntu-24.04-live-server-arm64.iso $NGINX_NOBLE_ARM64/ubuntu-24.04-live-server-arm64.iso -COPY html/ /usr/share/nginx/html/ \ No newline at end of file +COPY html/ /usr/share/nginx/html/ -- cgit 1.2.3-korg