From 0b947247146f27936e986c262fc9f1d641b5ac4f Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Wed, 17 Aug 2022 13:57:23 +0000 Subject: feat(ansible): Ubuntu Jammy VI. Signed-off-by: Peter Mikus Change-Id: I7dda690f2dc2e42bf6c67d3faa3327a03de3a9fa --- fdio.infra.pxe/docker-nginx/Dockerfile | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 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 45151ae83d..22e7632bd0 100644 --- a/fdio.infra.pxe/docker-nginx/Dockerfile +++ b/fdio.infra.pxe/docker-nginx/Dockerfile @@ -6,16 +6,12 @@ LABEL Version="2.0" RUN apt update \ && apt install -y wget -ENV ISO_FOCAL_AMD64 https://releases.ubuntu.com/20.04.4/ubuntu-20.04.4-live-server-amd64.iso -ENV ISO_FOCAL_ARM64 https://cdimage.ubuntu.com/releases/20.04/release/ubuntu-20.04.4-live-server-arm64.iso -ENV ISO_JAMMY_AMD64 https://releases.ubuntu.com/22.04/ubuntu-22.04-live-server-amd64.iso -ENV ISO_JAMMY_ARM64 https://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04-live-server-arm64.iso +ENV ISO_JAMMY_AMD64 https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso +ENV ISO_JAMMY_ARM64 https://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04.1-live-server-arm64.iso RUN echo "Preparing ISO Pre-cache" \ - && wget $ISO_FOCAL_AMD64 -O /ubuntu-20.04.4-live-server-amd64.iso \ - && wget $ISO_FOCAL_ARM64 -O /ubuntu-20.04.4-live-server-arm64.iso \ - && wget $ISO_JAMMY_AMD64 -O /ubuntu-22.04-live-server-amd64.iso \ - && wget $ISO_JAMMY_ARM64 -O /ubuntu-22.04-live-server-arm64.iso + && 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 FROM nginx:stable-alpine @@ -23,19 +19,13 @@ FROM nginx:stable-alpine LABEL Description="nginx service image" LABEL Version="2.0" -ENV NGINX_FOCAL_AMD64 /usr/share/nginx/html/ubuntu_focal_amd64/ -ENV NGINX_FOCAL_ARM64 /usr/share/nginx/html/ubuntu_focal_arm64/ ENV NGINX_JAMMY_AMD64 /usr/share/nginx/html/ubuntu_jammy_amd64/ ENV NGINX_JAMMY_ARM64 /usr/share/nginx/html/ubuntu_jammy_arm64/ -RUN mkdir -p $NGINX_FOCAL_AMD64 \ - && mkdir -p $NGINX_FOCAL_ARM64 \ - && mkdir -p $NGINX_JAMMY_AMD64 \ +RUN mkdir -p $NGINX_JAMMY_AMD64 \ && mkdir -p $NGINX_JAMMY_ARM64 -COPY --from=ubuntu_jammy /ubuntu-20.04.4-live-server-amd64.iso $NGINX_FOCAL_AMD64/ubuntu-20.04.4-live-server-amd64.iso -COPY --from=ubuntu_jammy /ubuntu-20.04.4-live-server-arm64.iso $NGINX_FOCAL_ARM64/ubuntu-20.04.4-live-server-arm64.iso -COPY --from=ubuntu_jammy /ubuntu-22.04-live-server-amd64.iso $NGINX_JAMMY_AMD64/ubuntu-22.04-live-server-amd64.iso -COPY --from=ubuntu_jammy /ubuntu-22.04-live-server-arm64.iso $NGINX_JAMMY_ARM64/ubuntu-22.04-live-server-arm64.iso +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 html/ /usr/share/nginx/html/ \ No newline at end of file -- cgit