X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=fdio.infra.pxe%2Fdocker-nginx%2FDockerfile;h=22e7632bd047ce74aa11c1c8c3dc86f3fe6102ed;hp=c171f116e8c38f21a91a535afa7edad732aa78cf;hb=0b947247146f27936e986c262fc9f1d641b5ac4f;hpb=d653bff621c44d0af1f4dcb786e9830362cdac38 diff --git a/fdio.infra.pxe/docker-nginx/Dockerfile b/fdio.infra.pxe/docker-nginx/Dockerfile index c171f116e8..22e7632bd0 100644 --- a/fdio.infra.pxe/docker-nginx/Dockerfile +++ b/fdio.infra.pxe/docker-nginx/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,12 +6,12 @@ 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_JAMMY_AMD64 https://releases.ubuntu.com/22.04/ubuntu-22.04.1-live-server-amd64.iso +ENV ISO_JAMMY_ARM64 https://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04.1-live-server-arm64.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_JAMMY_AMD64 -O /ubuntu-22.04.1-live-server-amd64.iso \ + && wget $ISO_JAMMY_ARM64 -O /ubuntu-22.04.1-live-server-arm64.iso FROM nginx:stable-alpine @@ -19,13 +19,13 @@ FROM nginx:stable-alpine LABEL Description="nginx service image" 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_JAMMY_AMD64 /usr/share/nginx/html/ubuntu_jammy_amd64/ +ENV NGINX_JAMMY_ARM64 /usr/share/nginx/html/ubuntu_jammy_arm64/ -RUN mkdir -p $NGINX_FOCAL_AMD64 \ - && mkdir -p $NGINX_FOCAL_ARM64 +RUN mkdir -p $NGINX_JAMMY_AMD64 \ + && mkdir -p $NGINX_JAMMY_ARM64 -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_jammy /ubuntu-22.04.1-live-server-amd64.iso $NGINX_JAMMY_AMD64/ubuntu-22.04.1-live-server-amd64.iso +COPY --from=ubuntu_jammy /ubuntu-22.04.1-live-server-arm64.iso $NGINX_JAMMY_ARM64/ubuntu-22.04.1-live-server-arm64.iso COPY html/ /usr/share/nginx/html/ \ No newline at end of file