diff options
| author |   pmikus <pmikus@cisco.com> | 2021-05-13 19:19:40 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2021-05-17 08:28:02 +0000 |
| commit | d4f082106d3e8cfda1c0d52bcafb177b46562944 (patch) | |
| tree | 6f86e14aab71be82bc438143cee1a0c2dfdfaf95 /fdio.infra.pxe/docker-dnsmasq | |
| parent | 505d4afb63c83b6d2e39727dd0d47bc6c697954c (diff) | |
Infra: Additional changes
Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: Ie08bd125c0d7b8e47344d34db77526f6714f5c0d
Diffstat (limited to 'fdio.infra.pxe/docker-dnsmasq')
| -rw-r--r-- | fdio.infra.pxe/docker-dnsmasq/Dockerfile | 12 | ||||
| -rw-r--r-- | fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:b4 | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/fdio.infra.pxe/docker-dnsmasq/Dockerfile b/fdio.infra.pxe/docker-dnsmasq/Dockerfile index 729e3c52d8..f88bf022c6 100644 --- a/fdio.infra.pxe/docker-dnsmasq/Dockerfile +++ b/fdio.infra.pxe/docker-dnsmasq/Dockerfile @@ -7,15 +7,18 @@ 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-focal-arm64/ \ + && mkdir -p /var/lib/tftpboot/casper/ubuntu-bionic-amd64/ 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_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 RUN echo "Preparing Grub EFI Binary" \ - && wget $EFI_FOCAL_AMD64 -O /var/lib/tftpboot/grub/grubnetx64.efi.signed \ + && wget $EFI_BIONIC_AMD64 -O /var/lib/tftpboot/grub/grubnetx64.efi.signed \ && wget $EFI_FOCAL_ARM64 -O /var/lib/tftpboot/grub/grubnetaa64.efi.signed RUN echo "Preparing Casper Kernel" \ @@ -24,7 +27,10 @@ RUN echo "Preparing Casper Kernel" \ && isoinfo -i /ubuntu-20.04.2-live-server-amd64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-focal-amd64/vmlinuz\ && wget $ISO_FOCAL_ARM64 -O /ubuntu-20.04.2-live-server-arm64.iso \ && isoinfo -i /ubuntu-20.04.2-live-server-arm64.iso -x "/CASPER/INITRD.;1" > /var/lib/tftpboot/casper/ubuntu-focal-arm64/initrd \ - && isoinfo -i /ubuntu-20.04.2-live-server-arm64.iso -x "/CASPER/VMLINUZ.;1" > /var/lib/tftpboot/casper/ubuntu-focal-arm64/vmlinuz + && isoinfo -i /ubuntu-20.04.2-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 FROM alpine diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:b4 b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:b4 index e30b56ce50..78faf1fa5d 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:b4 +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-ac:1f:6b:5a:6a:b4 @@ -1,4 +1,4 @@ menuentry "Install s47-nomad" { linux /casper/ubuntu-focal-amd64/vmlinuz ip=dhcp interface=ac:1f:6b:5a:6a:b4 url=https://releases.ubuntu.com/20.04.2/ubuntu-20.04.2-live-server-amd64.iso autoinstall ds=nocloud-net\;s=http://10.32.8.14:8081/ubuntu_focal_amd64/ac:1f:6b:5a:6a:b4/ --- console=ttyS0,115200n8 quiet initrd /casper/ubuntu-focal-amd64/initrd -} +}
\ No newline at end of file |