Skip to content
This repository has been archived by the owner on Jun 10, 2022. It is now read-only.

Commit

Permalink
fix: docker image base migrated to ubuntu v20.04 and zeromq version u…
Browse files Browse the repository at this point in the history
…pgraded 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 <[email protected]>
  • Loading branch information
yilmazbahadir and Baha authored Sep 21, 2021
1 parent 6d0ed74 commit 27ffcc9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions rest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -57,6 +57,6 @@
"sshpk": "1.16.1",
"winston": "^3.2.1",
"ws": "^7.1.0",
"zeromq": "^5.1.0"
"zeromq": "^5.2.8"
}
}
2 changes: 1 addition & 1 deletion rest/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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==
Expand Down

0 comments on commit 27ffcc9

Please sign in to comment.