From a0e84550fcef59dc923b6ed4668d8ba7a5e75a23 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Mon, 7 Jun 2021 16:06:43 +0300
Subject: [PATCH] User Node 14.x for docker base (#5480)

* User Node 14.x for docker base

* Move docker scripts

* Adjust paths

* Clean apt cache

* semgrep recommendations

* No recommends

* Additional clean
---
 .github/workflows/push-master.yml    |  2 +-
 Dockerfile => docker/Dockerfile      | 10 ++++++----
 scripts/docker.sh => docker/build.sh |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename Dockerfile => docker/Dockerfile (71%)
 rename scripts/docker.sh => docker/build.sh (94%)

diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
index 59976a3770..13ad972fd1 100644
--- a/.github/workflows/push-master.yml
+++ b/.github/workflows/push-master.yml
@@ -43,7 +43,7 @@ jobs:
       env:
         DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
       run: |
-        ./scripts/docker.sh
+        ./docker/build.sh
 
   # only run on "CI skip", i.e. when the actual version has been bumped to release/stable
   electron:
diff --git a/Dockerfile b/docker/Dockerfile
similarity index 71%
rename from Dockerfile
rename to docker/Dockerfile
index 360b2dbb3d..4c1d6d55c0 100644
--- a/Dockerfile
+++ b/docker/Dockerfile
@@ -1,18 +1,20 @@
 FROM ubuntu:18.04 as builder
 
 # Install any needed packages
-RUN apt-get update && apt-get install -y curl git gnupg
+RUN apt-get update && \
+  apt-get install --no-install-recommends -y curl git gnupg && \
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/*
 
 # install nodejs
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
-RUN apt-get install -y nodejs
+RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
+RUN apt-get install --no-install-recommends -y nodejs
 
 WORKDIR /apps
 COPY . .
 
 RUN npm install yarn -g
 RUN yarn && NODE_ENV=production yarn build:www
-CMD ["ls", "-al", "build"]
 
 # ===========================================================
 FROM nginx:stable-alpine
diff --git a/scripts/docker.sh b/docker/build.sh
similarity index 94%
rename from scripts/docker.sh
rename to docker/build.sh
index a64b3900c8..4a38dccf1f 100755
--- a/scripts/docker.sh
+++ b/docker/build.sh
@@ -19,7 +19,7 @@ VERSION=$(cat package.json \
   | sed 's/ //g')
 
 echo "*** Building $NAME"
-docker build -t $NAME .
+docker build -t $NAME -f docker/Dockerfile .
 
 docker login -u $REPO -p $DOCKER_PASS