From d58278047a7e1e060098577f3c2364df5a0a0d06 Mon Sep 17 00:00:00 2001
From: lain <lain@lain.org>
Date: Sat, 12 Aug 2023 16:58:50 -0400
Subject: [PATCH] Did the needful on Dockerfile to reduce number of layers in
 build process.

---
 Dockerfile | 69 +++++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e647a12f8..aa827a7af 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,48 +1,47 @@
 FROM ubuntu:22.04
-
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt -y update
-RUN apt -y upgrade
-RUN apt -y autoremove
-RUN apt install -y software-properties-common
-RUN apt install -y sudo
-RUN apt install -y supervisor
-RUN apt install -y python3-pip
-RUN apt install -y ffmpeg
-RUN apt install -y postgresql
-RUN apt install -y libpq-dev
-RUN apt install -y nano
-RUN apt install -y mailutils
+RUN apt -y update && \
+    apt -y upgrade && \
+    apt -y autoremove
+
+RUN apt install -y software-properties-common \
+                   sudo \
+                   supervisor \
+                   python3-pip \
+                   ffmpeg \
+                   postgresql \
+                   libpq-dev \
+                   nano \
+                   mailutils \
+                   nginx \
+                   wget \
+                   cmake
+
+RUN t=$(mktemp) && wget 'https://dist.1-2.dev/imei.sh' -qO "$t" && bash "$t" && rm "$t"
 
 COPY requirements.txt /requirements.txt
 COPY scripts/startup_docker_chat.sh /s
 
 RUN pip3 install -r /requirements.txt
 
-RUN mkdir /images
-RUN mkdir /chat_images
-RUN mkdir /dm_media
-RUN mkdir /songs
-RUN mkdir /temp_songs
-RUN mkdir /videos
-RUN mkdir /audio
-RUN mkdir /asset_submissions
-RUN mkdir /asset_submissions/emojis
-RUN mkdir /asset_submissions/hats
-RUN mkdir /asset_submissions/emojis/original
-RUN mkdir /asset_submissions/hats/original
-RUN mkdir /var/log/rdrama
+RUN mkdir /images && \
+    mkdir /chat_images && \ 
+    mkdir /dm_media && \
+    mkdir /songs && \
+    mkdir /temp_songs && \
+    mkdir /videos && \
+    mkdir /audio && \
+    mkdir /asset_submissions && \
+    mkdir /asset_submissions/emojis && \
+    mkdir /asset_submissions/hats && \
+    mkdir /asset_submissions/emojis/original && \
+    mkdir /asset_submissions/hats/original && \
+    mkdir /var/log/rdrama
 
-RUN apt install -y nginx
-RUN rm /etc/nginx/sites-available -r
-RUN rm /etc/nginx/sites-enabled/default
-RUN mkdir /etc/nginx/includes
-
-RUN apt install -y wget
-RUN apt -y update
-RUN apt upgrade -y cmake
-RUN t=$(mktemp) && wget 'https://dist.1-2.dev/imei.sh' -qO "$t" && bash "$t" && rm "$t"
+RUN rm /etc/nginx/sites-available -r && \
+    rm /etc/nginx/sites-enabled/default && \
+    mkdir /etc/nginx/includes
 
 EXPOSE 80/tcp
 
-- 
2.34.1