From 8825cfc2abf696395bd27bd0e7cea3653004280b Mon Sep 17 00:00:00 2001
From: Chris Packham <judge.packham@gmail.com>
Date: Sat, 14 May 2022 13:00:16 +1200
Subject: testing/docker: Add ubuntu:22.04

Add ubuntu:22.04 remove ubuntu:21.10.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
 testing/docker/ubuntu21.10/Dockerfile | 20 --------------------
 testing/docker/ubuntu22.04/Dockerfile | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 testing/docker/ubuntu21.10/Dockerfile
 create mode 100644 testing/docker/ubuntu22.04/Dockerfile

(limited to 'testing')

diff --git a/testing/docker/ubuntu21.10/Dockerfile b/testing/docker/ubuntu21.10/Dockerfile
deleted file mode 100644
index a1154649..00000000
--- a/testing/docker/ubuntu21.10/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM ubuntu:21.10
-ARG CTNG_UID=1000
-ARG CTNG_GID=1000
-RUN groupadd -g $CTNG_GID ctng
-RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng
-
-# Non-interactive configuration of tzdata
-ENV DEBIAN_FRONTEND noninteractive
-ENV DEBCONF_NONINTERACTIVE_SEEN true
-RUN { echo 'tzdata tzdata/Areas select Etc'; echo 'tzdata tzdata/Zones/Etc select UTC'; } | debconf-set-selections
-
-RUN apt-get update
-RUN apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \
-    python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
-    patch libstdc++6 rsync git meson ninja-build
-RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
-RUN chmod a+x /sbin/dumb-init
-RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile
-ENTRYPOINT [ "/sbin/dumb-init", "--" ]
-
diff --git a/testing/docker/ubuntu22.04/Dockerfile b/testing/docker/ubuntu22.04/Dockerfile
new file mode 100644
index 00000000..ab36a300
--- /dev/null
+++ b/testing/docker/ubuntu22.04/Dockerfile
@@ -0,0 +1,20 @@
+FROM ubuntu:22.04
+ARG CTNG_UID=1000
+ARG CTNG_GID=1000
+RUN groupadd -g $CTNG_GID ctng
+RUN useradd -d /home/ctng -m -g $CTNG_GID -u $CTNG_UID -s /bin/bash ctng
+
+# Non-interactive configuration of tzdata
+ENV DEBIAN_FRONTEND noninteractive
+ENV DEBCONF_NONINTERACTIVE_SEEN true
+RUN { echo 'tzdata tzdata/Areas select Etc'; echo 'tzdata tzdata/Zones/Etc select UTC'; } | debconf-set-selections
+
+RUN apt-get update
+RUN apt-get install -y gcc g++ gperf bison flex texinfo help2man make libncurses5-dev \
+    python3-dev autoconf automake libtool libtool-bin gawk wget bzip2 xz-utils unzip \
+    patch libstdc++6 rsync git meson ninja-build
+RUN wget -O /sbin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_x86_64
+RUN chmod a+x /sbin/dumb-init
+RUN echo 'export PATH=/opt/ctng/bin:$PATH' >> /etc/profile
+ENTRYPOINT [ "/sbin/dumb-init", "--" ]
+
-- 
cgit v1.2.3