feat(pxe): Add Ubuntu Jammy

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Ic9ba874d62442c0a1c803a29d1072e7dd85b7d57

2 files changed, 30 insertions, 19 deletions

diff --git a/fdio.infra.pxe/docker-dnsmasq/Dockerfile b/fdio.infra.pxe/docker-dnsmasq/Dockerfile
index d2e3734af2..e15a05d676 100644
--- a/fdio.infra.pxe/docker-dnsmasq/Dockerfile
+++ b/fdio.infra.pxe/docker-dnsmasq/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"
@@ -8,18 +8,22 @@ RUN apt update \
  && mkdir -p /var/lib/tftpboot/grub \
  && mkdir -p /var/lib/tftpboot/casper/ubuntu-focal-amd64/ \
  && mkdir -p /var/lib/tftpboot/casper/ubuntu-focal-arm64/ \
- && mkdir -p /var/lib/tftpboot/casper/ubuntu-bionic-amd64/
+ && mkdir -p /var/lib/tftpboot/casper/ubuntu-jammy-amd64/ \
+ && mkdir -p /var/lib/tftpboot/casper/ubuntu-jammy-arm64/
 
 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_BIONIC_AMD64 https://releases.ubuntu.com/18.04.5/ubuntu-18.04.5-live-server-amd64.iso
 ENV EFI_FOCAL_AMD64 http://archive.ubuntu.com/ubuntu/dists/focal/main/uefi/grub2-amd64/current/grubnetx64.efi.signed
 ENV EFI_FOCAL_ARM64 http://ports.ubuntu.com/ubuntu-ports/dists/focal/main/uefi/grub2-arm64/current/grubnetaa64.efi.signed
-ENV EFI_BIONIC_AMD64 http://archive.ubuntu.com/ubuntu/dists/bionic/main/uefi/grub2-amd64/current/grubnetx64.efi.signed
+
+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 EFI_JAMMY_AMD64 http://archive.ubuntu.com/ubuntu/dists/focal/main/uefi/grub2-amd64/current/grubnetx64.efi.signed
+ENV EFI_JAMMY_ARM64 http://ports.ubuntu.com/ubuntu-ports/dists/focal/main/uefi/grub2-arm64/current/grubnetaa64.efi.signed
 
 RUN echo "Preparing Grub EFI Binary" \
- && wget $EFI_BIONIC_AMD64 -O /var/lib/tftpboot/grub/grubnetx64.efi.signed \
- && wget $EFI_FOCAL_ARM64 -O /var/lib/tftpboot/grub/grubnetaa64.efi.signed
+ && wget $EFI_JAMMY_AMD64 -O /var/lib/tftpboot/grub/grubnetx64.efi.signed \
+ && wget $EFI_JAMMY_ARM64 -O /var/lib/tftpboot/grub/grubnetaa64.efi.signed
 
 RUN echo "Preparing Casper Kernel" \
  && wget $ISO_FOCAL_AMD64 -O /ubuntu-20.04.4-live-server-amd64.iso \
@@ -28,10 +32,12 @@ RUN echo "Preparing Casper Kernel" \
  && wget $ISO_FOCAL_ARM64 -O /ubuntu-20.04.4-live-server-arm64.iso \
  && isoinfo -i /ubuntu-20.04.4-live-server-arm64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-focal-arm64/initrd \
  && isoinfo -i /ubuntu-20.04.4-live-server-arm64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-focal-arm64/vmlinuz \
- && wget $ISO_BIONIC_AMD64 -O /ubuntu-18.04.5-live-server-amd64.iso \
- && isoinfo -i /ubuntu-18.04.5-live-server-amd64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-bionic-amd64/initrd \
- && isoinfo -i /ubuntu-18.04.5-live-server-amd64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-bionic-amd64/vmlinuz
-
+ && wget $ISO_JAMMY_AMD64 -O /ubuntu-22.04-live-server-amd64.iso \
+ && isoinfo -i /ubuntu-22.04-live-server-amd64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-jammy-amd64/initrd \
+ && isoinfo -i /ubuntu-22.04-live-server-amd64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-jammy-amd64/vmlinuz\
+ && wget $ISO_JAMMY_ARM64 -O /ubuntu-22.04-live-server-arm64.iso \
+ && isoinfo -i /ubuntu-22.04-live-server-arm64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-jammy-arm64/initrd \
+ && isoinfo -i /ubuntu-22.04-live-server-arm64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-jammy-arm64/vmlinuz
 
 FROM alpine
 
@@ -42,7 +48,7 @@ RUN apk add --update --no-cache dnsmasq \
  && rm -rf /var/cache/apk/*
 
 # Extract installer from previous image.
-COPY --from=ubuntu_focal /var/lib/tftpboot /var/lib/tftpboot
+COPY --from=ubuntu_jammy /var/lib/tftpboot /var/lib/tftpboot
 
 # Configure PXE.
 COPY tftpboot/ /var/lib/tftpboot/
diff --git a/fdio.infra.pxe/docker-nginx/Dockerfile b/fdio.infra.pxe/docker-nginx/Dockerfile
index 8cc9282bc0..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"
@@ -8,12 +8,14 @@ RUN apt update \
 
 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_BIONIC_AMD64 https://releases.ubuntu.com/18.04.5/ubuntu-18.04.5-live-server-amd64.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.4-live-server-amd64.iso \
  && wget $ISO_FOCAL_ARM64 -O /ubuntu-20.04.4-live-server-arm64.iso \
- && wget $ISO_BIONIC_AMD64 -O /ubuntu-18.04.5-live-server-amd64.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
@@ -23,14 +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_BIONIC_AMD64 /usr/share/nginx/html/ubuntu_bionic_amd64/
+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_BIONIC_AMD64
+ && mkdir -p $NGINX_JAMMY_AMD64 \
+ && mkdir -p $NGINX_JAMMY_ARM64
 
-COPY --from=ubuntu_focal /ubuntu-20.04.4-live-server-amd64.iso $NGINX_FOCAL_AMD64/ubuntu-20.04.4-live-server-amd64.iso
-COPY --from=ubuntu_focal /ubuntu-20.04.4-live-server-arm64.iso $NGINX_FOCAL_ARM64/ubuntu-20.04.4-live-server-arm64.iso
-COPY --from=ubuntu_focal /ubuntu-18.04.5-live-server-amd64.iso $NGINX_BIONIC_AMD64/ubuntu-18.04.5-live-server-amd64.iso
+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