Revert "Switch images to Ubuntu noble 24.04 (#277)"

This reverts commit f50a923.
coder · Sep 20, 2024 · 4d1986a · 4d1986a
1 parent f50a923
commit 4d1986a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ This repository contains example images for use with [Coder](https://coder.com/d
 
 - `enterprise-base`: Contains an example image that can be used as a base for
   other images.
-- `enterprise-minimal`: Contains a minimal image that contains only the required
+- `enterprise-minimal`: Contains a minimal image that contians only the required
   utilities for a Coder workspace to bootstrap successfully.
 
 ## Images on Docker Hub

diff --git a/images/base/docker.list b/images/base/docker.list
@@ -1 +1 @@
-deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu noble stable
+deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu jammy stable
diff --git a/images/base/ubuntu.Dockerfile b/images/base/ubuntu.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:noble
+FROM ubuntu:22.04
 
 SHELL ["/bin/bash", "-c"]
 ENV DEBIAN_FRONTEND=noninteractive
@@ -51,9 +51,8 @@ RUN ln -s /usr/libexec/docker/cli-plugins/docker-compose /usr/bin/docker-compose
 # Make typing unicode characters in the terminal work.
 ENV LANG=en_US.UTF-8
 
-# Remove the `ubuntu` user and add a user `coder` so that you're not developing as the `root` user
-RUN userdel -r ubuntu && \
-    useradd coder \
+# Add a user `coder` so that you're not developing as the `root` user
+RUN useradd coder \
     --create-home \
     --shell=/bin/bash \
     --groups=docker \

diff --git a/images/minimal/ubuntu.Dockerfile b/images/minimal/ubuntu.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:noble
+FROM ubuntu:22.04
 
 USER root
 ENV DEBIAN_FRONTEND=noninteractive
@@ -12,15 +12,12 @@ RUN apt-get update && \
     sudo \
     && rm -rf /var/lib/apt/lists/*
 
-# Make typing unicode characters in the terminal work.
-ENV LANG=en_US.UTF-8
-# Remove the `ubuntu` user and add a user `coder` so that you're not developing as the `root` user
-RUN userdel -r ubuntu && \
-    useradd coder \
+RUN useradd coder \
     --create-home \
     --shell=/bin/bash \
     --uid=1000 \
     --user-group && \
     echo "coder ALL=(ALL) NOPASSWD:ALL" >>/etc/sudoers.d/nopasswd
 
+ENV LANG=en_US.UTF-8
 USER coder