aboutsummaryrefslogtreecommitdiffstats
path: root/fdio.infra.pxe/docker-nginx
diff options
context:
space:
mode:
authorPeter Mikus <pmikus@cisco.com>2022-07-06 14:11:01 +0000
committerPeter Mikus <peter.mikus@protonmail.ch>2022-07-07 07:03:05 +0000
commitb9bbcde54bde17a1a6c7212a8b7befa265fd289f (patch)
treebfcd6734ff9db614a90240bd301dacdaca66b6cd /fdio.infra.pxe/docker-nginx
parent4458f261feaffaf131b88fb01f02e69be3f4680c (diff)
feat(pxe): Add Ubuntu Jammy
Signed-off-by: Peter Mikus <pmikus@cisco.com> Change-Id: Ic9ba874d62442c0a1c803a29d1072e7dd85b7d57
Diffstat (limited to 'fdio.infra.pxe/docker-nginx')
-rw-r--r--fdio.infra.pxe/docker-nginx/Dockerfile21
1 files changed, 13 insertions, 8 deletions
diff --git a/fdio.infra.pxe/docker-nginx/Dockerfile b/fdio.infra.pxe/docker-nginx/Dockerfile
index 8cc9282bc0..45151ae83d 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"
@@ -8,12 +8,14 @@ RUN apt update \
ENV ISO_FOCAL_AMD64 https://releases.ubuntu.com/20.04.4/ubuntu-20.04.4-live-server-amd64.iso
ENV ISO_FOCAL_ARM64 https://cdimage.ubuntu.com/releases/20.04/release/ubuntu-20.04.4-live-server-arm64.iso
-ENV ISO_BIONIC_AMD64 https://releases.ubuntu.com/18.04.5/ubuntu-18.04.5-live-server-amd64.iso
+ENV ISO_JAMMY_AMD64 https://releases.ubuntu.com/22.04/ubuntu-22.04-live-server-amd64.iso
+ENV ISO_JAMMY_ARM64 https://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04-live-server-arm64.iso
RUN echo "Preparing ISO Pre-cache" \
&& wget $ISO_FOCAL_AMD64 -O /ubuntu-20.04.4-live-server-amd64.iso \
&& wget $ISO_FOCAL_ARM64 -O /ubuntu-20.04.4-live-server-arm64.iso \
- && wget $ISO_BIONIC_AMD64 -O /ubuntu-18.04.5-live-server-amd64.iso
+ && wget $ISO_JAMMY_AMD64 -O /ubuntu-22.04-live-server-amd64.iso \
+ && wget $ISO_JAMMY_ARM64 -O /ubuntu-22.04-live-server-arm64.iso
FROM nginx:stable-alpine
@@ -23,14 +25,17 @@ 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/
+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 \
- && mkdir -p $NGINX_BIONIC_AMD64
+ && mkdir -p $NGINX_JAMMY_AMD64 \
+ && mkdir -p $NGINX_JAMMY_ARM64
-COPY --from=ubuntu_focal /ubuntu-20.04.4-live-server-amd64.iso $NGINX_FOCAL_AMD64/ubuntu-20.04.4-live-server-amd64.iso
-COPY --from=ubuntu_focal /ubuntu-20.04.4-live-server-arm64.iso $NGINX_FOCAL_ARM64/ubuntu-20.04.4-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 --from=ubuntu_jammy /ubuntu-20.04.4-live-server-amd64.iso $NGINX_FOCAL_AMD64/ubuntu-20.04.4-live-server-amd64.iso
+COPY --from=ubuntu_jammy /ubuntu-20.04.4-live-server-arm64.iso $NGINX_FOCAL_ARM64/ubuntu-20.04.4-live-server-arm64.iso
+COPY --from=ubuntu_jammy /ubuntu-22.04-live-server-amd64.iso $NGINX_JAMMY_AMD64/ubuntu-22.04-live-server-amd64.iso
+COPY --from=ubuntu_jammy /ubuntu-22.04-live-server-arm64.iso $NGINX_JAMMY_ARM64/ubuntu-22.04-live-server-arm64.iso
COPY html/ /usr/share/nginx/html/ \ No newline at end of file