From c35ef22abff858559e5a0ae10cbce0ade3cd2ab9 Mon Sep 17 00:00:00 2001
From: Muhammad Atif Ali <atif@coder.com>
Date: Wed, 17 Jan 2024 13:33:24 +0300
Subject: [PATCH] chore: format and optimize Dockerfiles (#256)

---
 images/base/Dockerfile.ubuntu    | 65 +++++++++++++++++---------------
 images/base/mirrorlist           |  1 -
 images/minimal/Dockerfile.ubuntu | 22 +++++------
 3 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 images/base/mirrorlist

diff --git a/images/base/Dockerfile.ubuntu b/images/base/Dockerfile.ubuntu
index fe32706..d302bde 100644
--- a/images/base/Dockerfile.ubuntu
+++ b/images/base/Dockerfile.ubuntu
@@ -1,42 +1,45 @@
 FROM ubuntu:22.04
 
 SHELL ["/bin/bash", "-c"]
+ENV DEBIAN_FRONTEND noninteractive
 
 # Install the Docker apt repository
 RUN apt-get update && \
-    DEBIAN_FRONTEND="noninteractive" apt-get upgrade --yes && \
-    DEBIAN_FRONTEND="noninteractive" apt-get install --yes ca-certificates
+    apt-get upgrade --yes && \
+    apt-get install --yes ca-certificates && \
+    rm -rf /var/lib/apt/lists/*
 COPY docker-archive-keyring.gpg /usr/share/keyrings/docker-archive-keyring.gpg
 COPY docker.list /etc/apt/sources.list.d/docker.list
 
 # Install baseline packages
 RUN apt-get update && \
-    DEBIAN_FRONTEND="noninteractive" apt-get install --yes \
-      bash \
-      build-essential \
-      ca-certificates \
-      containerd.io \
-      curl \
-      docker-ce \
-      docker-ce-cli \
-      docker-buildx-plugin \
-      docker-compose-plugin \
-      htop \
-      locales \
-      man \
-      python3 \
-      python3-pip \
-      software-properties-common \
-      sudo \
-      systemd \
-      systemd-sysv \
-      unzip \
-      vim \
-      wget \
-      rsync && \
+    apt-get install --yes \
+    bash \
+    build-essential \
+    ca-certificates \
+    containerd.io \
+    curl \
+    docker-ce \
+    docker-ce-cli \
+    docker-buildx-plugin \
+    docker-compose-plugin \
+    htop \
+    locales \
+    man \
+    python3 \
+    python3-pip \
+    software-properties-common \
+    sudo \
+    systemd \
+    systemd-sysv \
+    unzip \
+    vim \
+    wget \
+    rsync && \
     # Install latest Git using their official PPA
     add-apt-repository ppa:git-core/ppa && \
-    DEBIAN_FRONTEND="noninteractive" apt-get install --yes git
+    apt-get install --yes git \
+    && rm -rf /var/lib/apt/lists/*
 
 # Enables Docker starting with systemd
 RUN systemctl enable docker
@@ -49,11 +52,11 @@ ENV LANG en_US.UTF-8
 
 # Add a user `coder` so that you're not developing as the `root` user
 RUN useradd coder \
-      --create-home \
-      --shell=/bin/bash \
-      --groups=docker \
-      --uid=1000 \
-      --user-group && \
+    --create-home \
+    --shell=/bin/bash \
+    --groups=docker \
+    --uid=1000 \
+    --user-group && \
     echo "coder ALL=(ALL) NOPASSWD:ALL" >>/etc/sudoers.d/nopasswd
 
 USER coder
diff --git a/images/base/mirrorlist b/images/base/mirrorlist
deleted file mode 100644
index 050373f..0000000
--- a/images/base/mirrorlist
+++ /dev/null
@@ -1 +0,0 @@
-Server=https://archive.archlinux.org/repos/2021/02/01/$repo/os/$arch
diff --git a/images/minimal/Dockerfile.ubuntu b/images/minimal/Dockerfile.ubuntu
index c9a49be..6f095ef 100644
--- a/images/minimal/Dockerfile.ubuntu
+++ b/images/minimal/Dockerfile.ubuntu
@@ -4,20 +4,18 @@ USER root
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-        bash \
-        ca-certificates \
-        curl \
-        git \
-	sudo
-
-RUN apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+    bash \
+    ca-certificates \
+    curl \
+    git \
+    sudo \
+    && rm -rf /var/lib/apt/lists/*
 
 RUN useradd coder \
-        --create-home \
-        --shell=/bin/bash \
-        --uid=1000 \
-        --user-group && \
+    --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