X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=fdio.infra.pxe%2Fdocker-nginx%2FDockerfile;h=45151ae83d2768015e0d37b7bbe8e6d84a6ca329;hb=82b34c726b4eb93fbb8ca48b491dd7da65cb813b;hp=c171f116e8c38f21a91a535afa7edad732aa78cf;hpb=d653bff621c44d0af1f4dcb786e9830362cdac38;p=csit.git

diff --git a/fdio.infra.pxe/docker-nginx/Dockerfile b/fdio.infra.pxe/docker-nginx/Dockerfile
index c171f116e8..45151ae83d 100644
--- a/fdio.infra.pxe/docker-nginx/Dockerfile
+++ b/fdio.infra.pxe/docker-nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 as ubuntu_focal
+FROM ubuntu:22.04 as ubuntu_jammy
 
 LABEL Description="ubuntu intermediate image"
 LABEL Version="2.0"
@@ -6,12 +6,16 @@ LABEL Version="2.0"
 RUN apt update \
  && apt install -y wget
 
-ENV ISO_FOCAL_AMD64 https://releases.ubuntu.com/20.04.2/ubuntu-20.04.2-live-server-amd64.iso
-ENV ISO_FOCAL_ARM64 https://cdimage.ubuntu.com/releases/20.04/release/ubuntu-20.04.2-live-server-arm64.iso
+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
 
 RUN echo "Preparing ISO Pre-cache" \
- && wget $ISO_FOCAL_AMD64 -O /ubuntu-20.04.2-live-server-amd64.iso \
- && wget $ISO_FOCAL_ARM64 -O /ubuntu-20.04.2-live-server-arm64.iso
+ && 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
 
 
 FROM nginx:stable-alpine
@@ -21,11 +25,17 @@ 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
-
-COPY --from=ubuntu_focal /ubuntu-20.04.2-live-server-amd64.iso $NGINX_FOCAL_AMD64/ubuntu-20.04.2-live-server-amd64.iso
-COPY --from=ubuntu_focal /ubuntu-20.04.2-live-server-arm64.iso $NGINX_FOCAL_ARM64/ubuntu-20.04.2-live-server-arm64.iso
+ && mkdir -p $NGINX_FOCAL_ARM64 \
+ && 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 html/ /usr/share/nginx/html/
\ No newline at end of file