X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=fdio.infra.pxe%2Fdocker-dnsmasq%2FDockerfile;h=6c7dd5a16a392bcedfbc6bd96abf1a1c0e319178;hb=018660080bb9419dc658d6996be855e7219cf602;hp=4d6cb9c9f9b55a008108ee33585378f4209575b2;hpb=a5e623b3cd749ab86627b733c7c2c99c58588e90;p=csit.git

diff --git a/fdio.infra.pxe/docker-dnsmasq/Dockerfile b/fdio.infra.pxe/docker-dnsmasq/Dockerfile
index 4d6cb9c9f9..6c7dd5a16a 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"
@@ -6,32 +6,30 @@ LABEL Version="2.0"
 RUN apt update \
  && apt install -y wget genisoimage syslinux-common \
  && 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/grub/fonts \
+ && 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.3/ubuntu-20.04.3-live-server-amd64.iso
-ENV ISO_FOCAL_ARM64 https://cdimage.ubuntu.com/releases/20.04/release/ubuntu-20.04.3-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://old-releases.ubuntu.com/releases/22.04.1/ubuntu-22.04.1-live-server-amd64.iso
+ENV ISO_JAMMY_ARM64 https://old-releases.ubuntu.com/releases/22.04.1/ubuntu-22.04.1-live-server-arm64.iso
+ENV EFI_JAMMY_AMD64 http://archive.ubuntu.com/ubuntu/dists/jammy/main/uefi/grub2-amd64/current/grubnetx64.efi.signed
+ENV EFI_JAMMY_ARM64 http://ports.ubuntu.com/ubuntu-ports/dists/jammy/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/grubx64.efi \
+ && wget $EFI_JAMMY_ARM64 -O /var/lib/tftpboot/grubaa64.efi \
+ && apt download shim-signed \
+ && dpkg-deb --fsys-tarfile shim-signed*deb | tar x ./usr/lib/shim/shimx64.efi.signed.latest -O > /var/lib/tftpboot/bootx64.efi \
+ && apt download grub-common \
+ && dpkg-deb --fsys-tarfile grub-common*deb | tar x ./usr/share/grub/unicode.pf2 -O > /var/lib/tftpboot/grub/fonts/unicode.pf2
 
 RUN echo "Preparing Casper Kernel" \
- && wget $ISO_FOCAL_AMD64 -O /ubuntu-20.04.3-live-server-amd64.iso \
- && isoinfo -i /ubuntu-20.04.3-live-server-amd64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-focal-amd64/initrd \
- && isoinfo -i /ubuntu-20.04.3-live-server-amd64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-focal-amd64/vmlinuz\
- && wget $ISO_FOCAL_ARM64 -O /ubuntu-20.04.3-live-server-arm64.iso \
- && isoinfo -i /ubuntu-20.04.3-live-server-arm64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-focal-arm64/initrd \
- && isoinfo -i /ubuntu-20.04.3-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.1-live-server-amd64.iso \
+ && isoinfo -i /ubuntu-22.04.1-live-server-amd64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-jammy-amd64/initrd \
+ && isoinfo -i /ubuntu-22.04.1-live-server-amd64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-jammy-amd64/vmlinuz \
+ && wget $ISO_JAMMY_ARM64 -O /ubuntu-22.04.1-live-server-arm64.iso \
+ && isoinfo -i /ubuntu-22.04.1-live-server-arm64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-jammy-arm64/initrd \
+ && isoinfo -i /ubuntu-22.04.1-live-server-arm64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-jammy-arm64/vmlinuz
 
 FROM alpine
 
@@ -42,7 +40,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/