From 27ffcc9833aa2edf7d5a08d7f7aeb958d4341eee Mon Sep 17 00:00:00 2001
From: yilmazbahadir <yilmazbahadir@gmail.com>
Date: Tue, 21 Sep 2021 19:10:00 +0100
Subject: [PATCH] fix: docker image base migrated to ubuntu v20.04 and zeromq
 version upgraded to v5.2.8 (#659)

* fix: docker image base migrated to ubuntu v20.04 and zeromq version upgraded to v5.2.8

* fix: changed default nvm env

* dockerfile line ending fix

* removed nvm and changed version to 12.x(latest)

Co-authored-by: Baha <bahadir.yilmaz@nem.software>
---
 Dockerfile        | 20 ++++++++++----------
 rest/package.json |  4 ++--
 rest/yarn.lock    |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e708612d..90233915 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
-FROM node:12.18.1-alpine
-RUN apk add --update\
- python \
- python3 \
- build-base \
- zeromq-dev \
- && rm -rf /var/cache/apk/*
+FROM ubuntu:20.04
+
+RUN apt-get update && apt-get install -y curl \
+    && curl -fsSL https://deb.nodesource.com/setup_12.x | bash - \
+    && apt-get install -y nodejs \
+    && node --version \
+    && npm --version \
+    && npm install -g yarn
+
 WORKDIR /app
 COPY . /app/catapult-rest
-RUN cd catapult-rest \
- && ./yarn_setup.sh
-RUN cd catapult-rest/rest
+RUN cd catapult-rest && ./yarn_setup.sh
 WORKDIR /app/catapult-rest/rest
diff --git a/rest/package.json b/rest/package.json
index fb1e8f76..59f128f8 100644
--- a/rest/package.json
+++ b/rest/package.json
@@ -15,7 +15,7 @@
     "lint:fix": "eslint src test --fix",
     "lint:jenkins": "eslint -o tests.catapult.lint.xml -f junit src test || exit 0",
     "bootstrap-clean": "symbol-bootstrap clean",
-    "bootstrap-start": "symbol-bootstrap start -a light -c bootstrap-preset.yml --healthCheck --noPassword",
+    "bootstrap-start": "symbol-bootstrap start -a light -c bootstrap-preset-local.yml --healthCheck --noPassword",
     "bootstrap-start-testnet": "symbol-bootstrap start -p testnet -a dual -c bootstrap-preset-testnet.yml --healthCheck --noPassword",
     "bootstrap-start-mainnet": "symbol-bootstrap start -p testnet -a dual -c bootstrap-preset-mainnet.yml --healthCheck --noPassword",
     "bootstrap-start-detached": "symbol-bootstrap start -a light -c bootstrap-preset.yml --detached --healthCheck --noPassword",
@@ -57,6 +57,6 @@
     "sshpk": "1.16.1",
     "winston": "^3.2.1",
     "ws": "^7.1.0",
-    "zeromq": "^5.1.0"
+    "zeromq": "^5.2.8"
   }
 }
diff --git a/rest/yarn.lock b/rest/yarn.lock
index 7bc3b99d..73a30962 100644
--- a/rest/yarn.lock
+++ b/rest/yarn.lock
@@ -7232,7 +7232,7 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-zeromq@^5.1.0:
+zeromq@^5.2.8:
   version "5.2.8"
   resolved "https://registry.yarnpkg.com/zeromq/-/zeromq-5.2.8.tgz#94b0b85e4152e98b8bb163f1db4a34280d44d9d0"
   integrity sha512-bXzsk7KOmgLSv1tC0Ms1VXBy90+Rz27ZYf27cLuldRYbpqYpuWJfxxHFhO710t22zgWBnmdUP0m3SKFpLI0u5g==