X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=fdio.infra.pxe%2Fdocker-nginx%2FDockerfile;h=0e3054f21017592f44473ae51e3bf90d1c9a6447;hp=c171f116e8c38f21a91a535afa7edad732aa78cf;hb=d4f082106d3e8cfda1c0d52bcafb177b46562944;hpb=505d4afb63c83b6d2e39727dd0d47bc6c697954c 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