From dfeccfa481123b2bca348bfe2d5226507e48169f Mon Sep 17 00:00:00 2001
From: acalcutt <acalcutt@techidiots.net>
Date: Sat, 1 Oct 2022 09:47:25 -0400
Subject: [PATCH] try to add suggestions

---
 Dockerfile       | 60 +++++++++++++++++++++++++-----------------------
 Dockerfile_light | 34 +++++++++++++++------------
 Dockerfile_test  | 26 +++++++++++----------
 3 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ea48dd3..ed02b51 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,38 @@
 FROM ubuntu:focal AS builder
 
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get -qq update \
-  && apt-get -y --no-install-recommends install \
+ENV \
+    NODE_ENV="production" \
+    DEBIAN_FRONTEND=noninteractive
+
+RUN set -ex; \
+    apt-get -qq update; \
+    apt-get -y --no-install-recommends install \
       ca-certificates \
-      wget \
-  && apt-get -y --purge autoremove \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
+      wget; \
+    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+    apt-get install -y nodejs; \
+    apt-get -y remove wget; \
+    apt-get -y --purge autoremove; \
+    apt-get clean; \
+    rm -rf /var/lib/apt/lists/*;
   
-RUN wget -qO- https://deb.nodesource.com/setup_16.x | bash
-RUN apt-get install -y nodejs
-
 COPY . /usr/src/app
 
-ENV NODE_ENV="production"
-
 RUN cd /usr/src/app && npm install --production
 
-
 FROM ubuntu:focal AS final
 
-RUN groupadd -r node && useradd -r -g node node
+ENV \
+    NODE_ENV="production" \
+    CHOKIDAR_USEPOLLING=1 \
+    CHOKIDAR_INTERVAL=500 \
+    DEBIAN_FRONTEND=noninteractive
 
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get -qq update \
-  && apt-get -y --no-install-recommends install \
+RUN set -ex; \
+    groupadd -r node; \
+    useradd -r -g node node; \
+    apt-get -qq update; \
+    apt-get -y --no-install-recommends install \
       ca-certificates \
       wget \
       pkg-config \
@@ -34,21 +41,16 @@ RUN export DEBIAN_FRONTEND=noninteractive \
       libuv1-dev \
       libjpeg-turbo8 \
       libicu66 \
-      unzip \
-      libcurl4-openssl-dev \
-  && apt-get -y --purge autoremove \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-RUN wget -qO- https://deb.nodesource.com/setup_16.x | bash
-RUN apt-get install -y nodejs
+      libcurl4-openssl-dev; \
+    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+    apt-get install -y nodejs; \
+    apt-get -y remove wget; \
+    apt-get -y --purge autoremove; \
+    apt-get clean; \
+    rm -rf /var/lib/apt/lists/*;
 
 COPY --from=builder /usr/src/app /app
 
-ENV NODE_ENV="production"
-ENV CHOKIDAR_USEPOLLING=1
-ENV CHOKIDAR_INTERVAL=500
-
 VOLUME /data
 WORKDIR /data
 
diff --git a/Dockerfile_light b/Dockerfile_light
index 2ae0342..1ef69c4 100644
--- a/Dockerfile_light
+++ b/Dockerfile_light
@@ -1,21 +1,25 @@
 FROM ubuntu:focal
 
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && apt-get -qq update \
-  && apt-get -y --no-install-recommends install \
-      ca-certificates \
-      wget \
-  && apt-get -y --purge autoremove \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-  
-RUN wget -qO- https://deb.nodesource.com/setup_16.x | bash
-RUN apt-get install -y nodejs
-RUN groupadd -r node && useradd -r -g node node
+ENV \
+    NODE_ENV="production" \
+    CHOKIDAR_USEPOLLING=1 \
+    CHOKIDAR_INTERVAL=500 \
+    DEBIAN_FRONTEND=noninteractive
+
+RUN set -ex; \
+    groupadd -r node; \
+    useradd -r -g node node; \
+    apt-get -qq update; \
+    apt-get -y --no-install-recommends install \
+      ca-certificates \
+      wget; \
+    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+    apt-get install -y nodejs; \
+    apt-get -y remove wget; \
+    apt-get -y --purge autoremove; \
+    apt-get clean; \
+    rm -rf /var/lib/apt/lists/*;
 
-ENV NODE_ENV="production"
-ENV CHOKIDAR_USEPOLLING=1
-ENV CHOKIDAR_INTERVAL=500
 EXPOSE 80
 VOLUME /data
 WORKDIR /data
diff --git a/Dockerfile_test b/Dockerfile_test
index f76409c..624f324 100644
--- a/Dockerfile_test
+++ b/Dockerfile_test
@@ -4,9 +4,14 @@
 
 FROM ubuntu:focal
 
-RUN apt-get -qq update \
-&& DEBIAN_FRONTEND=noninteractive apt-get -y install \
-      ca-certificates \	
+ENV \
+    NODE_ENV="test" \
+    DEBIAN_FRONTEND=noninteractive
+
+RUN set -ex; \
+    apt-get -qq update; \
+    apt-get -y --no-install-recommends install \
+      ca-certificates \
       wget \
       pkg-config \
       xvfb \
@@ -15,19 +20,16 @@ RUN apt-get -qq update \
       libjpeg-turbo8 \
       libicu66 \
       unzip \
-      libcurl4-openssl-dev \
-&& apt-get clean
-
-RUN wget -qO- https://deb.nodesource.com/setup_16.x | bash
-RUN apt-get install -y nodejs
+      libcurl4-openssl-dev; \
+    wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
+    apt-get install -y nodejs; \
+    apt-get clean;
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
-RUN wget -O test_data.zip https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/test_data.zip
-RUN unzip -q test_data.zip -d test_data
-
-ENV NODE_ENV="test"
+RUN wget -O test_data.zip https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/test_data.zip; \
+    unzip -q test_data.zip -d test_data
 
 COPY package.json .
 RUN npm install