X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=fdio.infra.pxe%2Fdocker-nginx%2FDockerfile;h=0ea204cd005220db55866adcc1407d7315ed5684;hb=10bd74d4820e296cc35d5dc3ff671e43a07343bc;hp=c171f116e8c38f21a91a535afa7edad732aa78cf;hpb=d653bff621c44d0af1f4dcb786e9830362cdac38;p=csit.git diff --git a/fdio.infra.pxe/docker-nginx/Dockerfile b/fdio.infra.pxe/docker-nginx/Dockerfile index c171f116e8..0ea204cd00 100644 --- a/fdio.infra.pxe/docker-nginx/Dockerfile +++ b/fdio.infra.pxe/docker-nginx/Dockerfile @@ -6,12 +6,14 @@ LABEL Version="2.0" RUN apt update \ && apt install -y wget -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_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 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_AMD64 -O /ubuntu-20.04.3-live-server-amd64.iso \ + && wget $ISO_FOCAL_ARM64 -O /ubuntu-20.04.3-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-20.04.3-live-server-amd64.iso $NGINX_FOCAL_AMD64/ubuntu-20.04.3-live-server-amd64.iso +COPY --from=ubuntu_focal /ubuntu-20.04.3-live-server-arm64.iso $NGINX_FOCAL_ARM64/ubuntu-20.04.3-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