From d4f082106d3e8cfda1c0d52bcafb177b46562944 Mon Sep 17 00:00:00 2001 From: pmikus Date: Thu, 13 May 2021 19:19:40 +0000 Subject: Infra: Additional changes Signed-off-by: pmikus Change-Id: Ie08bd125c0d7b8e47344d34db77526f6714f5c0d --- fdio.infra.pxe/docker-nginx/Dockerfile | 9 +- .../ac:1f:6b:5a:6a:b4/vendor-data | 120 --------------------- 2 files changed, 7 insertions(+), 122 deletions(-) delete mode 100644 fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:5a:6a:b4/vendor-data (limited to 'fdio.infra.pxe/docker-nginx') diff --git a/fdio.infra.pxe/docker-nginx/Dockerfile b/fdio.infra.pxe/docker-nginx/Dockerfile index c171f116e8..0e3054f210 100644 --- a/fdio.infra.pxe/docker-nginx/Dockerfile +++ b/fdio.infra.pxe/docker-nginx/Dockerfile @@ -8,10 +8,12 @@ RUN apt update \ 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 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_ARM64 -O /ubuntu-20.04.2-live-server-arm64.iso \ + && wget $ISO_BIONIC_AMD64 -O /ubuntu-18.04.5-live-server-amd64.iso FROM nginx:stable-alpine @@ -21,11 +23,14 @@ 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/ RUN mkdir -p $NGINX_FOCAL_AMD64 \ - && mkdir -p $NGINX_FOCAL_ARM64 + && mkdir -p $NGINX_FOCAL_ARM64 \ + && mkdir -p $NGINX_BIONIC_AMD64 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 +COPY --from=ubuntu_focal /ubuntu-18.04.5-live-server-amd64.iso $NGINX_BIONIC_AMD64/ubuntu-18.04.5-live-server-amd64.iso COPY html/ /usr/share/nginx/html/ \ No newline at end of file diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:5a:6a:b4/vendor-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:5a:6a:b4/vendor-data deleted file mode 100644 index 574207c48d..0000000000 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_amd64/ac:1f:6b:5a:6a:b4/vendor-data +++ /dev/null @@ -1,120 +0,0 @@ -#cloud-config -autoinstall: - version: 1 - apt: - geoip: true - preserve_sources_list: false - primary: - - arches: [amd64, i386] - uri: http://ca.archive.ubuntu.com/ubuntu - - arches: [default] - uri: http://ports.ubuntu.com/ubuntu-ports - identity: - hostname: s47-nomad - password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 - realname: localadmin - username: localadmin - keyboard: - layout: us - toggle: null - variant: '' - locale: en_US.UTF-8 - network: - ethernets: - eno1: - addresses: [ 10.32.8.15/24 ] - dhcp4: false - gateway4: 10.32.8.1 - nameservers: - addresses: [ 1.1.1.1, 8.8.8.8 ] - version: 2 - packages: - - python3 - refresh-installer: - update: no - ssh: - allow-pw: true - authorized-keys: [] - install-server: true - storage: - config: - - grub_device: false - id: disk-sda - path: /dev/sda - ptable: gpt - preserve: false - type: disk - wipe: superblock-recursive - - grub_device: false - id: disk-sdb - path: /dev/sdb - ptable: gpt - preserve: false - type: disk - wipe: superblock-recursive - - device: disk-sda - grub_device: true - id: partition-0 - flag: boot - number: 1 - preserve: false - size: 536870912 - type: partition - wipe: superblock - - device: disk-sdb - grub_device: true - id: partition-1 - flag: boot - number: 1 - preserve: false - size: 536870912 - type: partition - wipe: superblock - - id: format-0 - fstype: fat32 - preserve: false - type: format - volume: partition-0 - - id: format-1 - fstype: fat32 - preserve: false - type: format - volume: partition-1 - - device: disk-sda - flag: '' - grub_device: false - id: partition-2 - number: 2 - preserve: false - size: -1 - type: partition - wipe: superblock - - device: disk-sdb - flag: '' - grub_device: false - id: partition-3 - number: 2 - preserve: false - size: -1 - type: partition - wipe: superblock - - name: md0 - raidlevel: raid1 - devices: [partition-2, partition-3] - spare_devices: [] - preserve: false - type: raid - id: raid-0 - - fstype: ext4 - id: format-2 - preserve: false - type: format - volume: raid-0 - - device: format-2 - id: mount-1 - path: / - type: mount - - device: format-0 - id: mount-0 - path: /boot/efi - type: mount \ No newline at end of file -- cgit 1.2.3-korg