[PATCH a001 v1 1/7] Use nginx from Ubuntu for simplicity

[Ammar Faizi <ammarfaizi2@gnuweeb.org>]

Using custom nginx package has different directory structures. It
confuses me when migrating the old data to this new docker container.
Just use the nginx that Ubuntu provides.

Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
---
 Dockerfile             | 20 +++++++-------------
 apt-sources/nginx.list |  2 --
 2 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 apt-sources/nginx.list

diff --git a/Dockerfile b/Dockerfile
index 92d79f31f3f888e9..721ef4de494e186e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,10 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN yes | unminimize
 
 # Install base packages
-RUN apt-get update && apt-get -y --no-install-recommends install ca-certificates gnupg htop ncurses-term vim software-properties-common sudo wget net-tools rsyslog
+RUN apt-get update && apt-get -y --no-install-recommends install \
+    ca-certificates gnupg htop ncurses-term vim \
+    software-properties-common sudo wget net-tools rsyslog \
+    openssh-server nginx mysql-server
 
 # Change root password, and create main user
 RUN echo "root:${rootPassword}" | chpasswd \
@@ -21,17 +24,6 @@ RUN echo "root:${rootPassword}" | chpasswd \
     && usermod -aG sudo ${mainUser} \
     && sed -i /etc/sudoers -re '/%sudo ALL=(ALL:ALL) ALL/s/^#//g'
 
-# Copy additional apt sources
-COPY apt-sources/* /etc/apt/sources.list.d
-
-# Install server components
-RUN apt-key adv --fetch-keys https://nginx.org/keys/nginx_signing.key \
-    && apt-get update \
-    && apt-get -y --no-install-recommends install openssh-server nginx mysql-server
-
-# Mark port 48589/tcp is to be exposed
-EXPOSE 48589/tcp 25/tcp 25/tcp 465/tcp 587/tcp 143/tcp 993/tcp
-
 # Apply SSH config and add public keys
 COPY etc/ssh/sshd_config /etc/ssh/sshd_config
 RUN rm -rf /root/.ssh /home/${mainUser}/.ssh
@@ -45,7 +37,9 @@ RUN chown -R root:root /root/.ssh \
 
 # Mailserver
 RUN apt update \
-    && apt -y --no-install-recommends install postfix postfix-mysql postfix-policyd-spf-python dovecot-core dovecot-imapd dovecot-lmtpd dovecot-mysql opendkim opendmarc
+    && apt -y --no-install-recommends install postfix postfix-mysql \
+       postfix-policyd-spf-python dovecot-core dovecot-imapd \
+       dovecot-lmtpd dovecot-mysql opendkim opendmarc
 
 COPY mailserver /root/mailserver
 RUN --mount=type=secret,required=true,id=config /root/mailserver/setup.sh
diff --git a/apt-sources/nginx.list b/apt-sources/nginx.list
deleted file mode 100644
index 4ae2224978c48157..0000000000000000
--- a/apt-sources/nginx.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb https://nginx.org/packages/ubuntu/ focal nginx
-deb-src https://nginx.org/packages/ubuntu/ focal nginx
\ No newline at end of file
-- 
Ammar Faizi