From fc48af84c0c920e8879047d06dbe0504f0c12ff9 Mon Sep 17 00:00:00 2001
From: Alex Anderson <191496+alxndrsn@users.noreply.github.com>
Date: Thu, 23 Feb 2023 09:52:46 +0300
Subject: [PATCH] dockerfiles: run linked commands with && (#354)

Co-authored-by: alxndrsn <alxndrsn>
---
 enketo.dockerfile  | 3 ++-
 nginx.dockerfile   | 3 ++-
 service.dockerfile | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/enketo.dockerfile b/enketo.dockerfile
index 2377d95a..95a4e4b8 100644
--- a/enketo.dockerfile
+++ b/enketo.dockerfile
@@ -14,7 +14,8 @@ COPY files/enketo/config.json.template ${ENKETO_SRC_DIR}/config/config.json.temp
 COPY files/enketo/config.json.template ${ENKETO_SRC_DIR}/config/config.json
 COPY files/enketo/start-enketo.sh ${ENKETO_SRC_DIR}/start-enketo.sh
 
-RUN apt-get update; apt-get install gettext-base
+RUN apt-get update && \
+    apt-get install gettext-base
 
 EXPOSE 8005
 
diff --git a/nginx.dockerfile b/nginx.dockerfile
index fbbf7f70..01cb39be 100644
--- a/nginx.dockerfile
+++ b/nginx.dockerfile
@@ -13,7 +13,8 @@ EXPOSE 443
 VOLUME [ "/etc/dh", "/etc/selfsign", "/etc/nginx/conf.d" ]
 ENTRYPOINT [ "/bin/bash", "/scripts/odk-setup.sh" ]
 
-RUN apt-get update; apt-get install -y openssl netcat nginx-extras lua-zlib
+RUN apt-get update && \
+    apt-get install -y openssl netcat nginx-extras lua-zlib
 
 RUN mkdir -p /etc/selfsign/live/local/
 COPY files/nginx/odk-setup.sh /scripts/
diff --git a/service.dockerfile b/service.dockerfile
index 5b644ee8..59e602ab 100644
--- a/service.dockerfile
+++ b/service.dockerfile
@@ -12,9 +12,9 @@ FROM node:16.17.0
 
 WORKDIR /usr/odk
 
-RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(grep -oP 'VERSION_CODENAME=\K\w+' /etc/os-release)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list; \
-  curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg; \
-  apt-get update; \
+RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(grep -oP 'VERSION_CODENAME=\K\w+' /etc/os-release)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list && \
+  curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg && \
+  apt-get update && \
   apt-get install -y cron gettext postgresql-client-14
 
 COPY files/service/crontab /etc/cron.d/odk