diff --git a/.circleci/config.yml b/.circleci/config.yml index 61c9350bce2..3fa89ce6a54 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,6 +5,7 @@ defaults: &defaults image: circleci/classic:latest docker_layer_caching: true working_directory: ~/bitcore + version: 2 workflows: version: 2 diff --git a/Dockerfile b/Dockerfile index 846c75350e8..7dbdd1724f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,29 +1,78 @@ -FROM node:carbon -WORKDIR /usr/src/app -COPY package*.json ./ -RUN npm install +FROM node:10 + +# Install Chrome + +RUN echo 'deb http://dl.google.com/linux/chrome/deb/ stable main' > /etc/apt/sources.list.d/chrome.list + +RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - + +RUN set -x \ + && apt-get update \ + && apt-get install -y \ + google-chrome-stable + +ENV CHROME_BIN /usr/bin/google-chrome + +# Log versions + +RUN set -x \ + && node -v \ + && npm -v \ + && google-chrome --version + + +RUN npm i -g npm@6.4.1 + +WORKDIR /bitcore + +# Add source COPY lerna.json ./ +COPY package*.json ./ + +COPY ./packages/bitcore-client/package.json ./packages/bitcore-client/package.json +COPY ./packages/bitcore-client/package-lock.json ./packages/bitcore-client/package-lock.json -COPY ./packages/bitcore-build/package.json ./packages/bitcore-build/package.json -COPY ./packages/bitcore-mnemonic/package.json ./packages/bitcore-mnemonic/package.json -COPY ./packages/bitcore-lib/package.json ./packages/bitcore-lib/package.json -COPY ./packages/bitcore-lib-cash/package.json ./packages/bitcore-lib-cash/package.json -COPY ./packages/bitcore-p2p/package.json ./packages/bitcore-p2p/package.json -COPY ./packages/bitcore-p2p-cash/package.json ./packages/bitcore-p2p-cash/package.json -COPY ./packages/bitcore-wallet-client/package.json ./packages/bitcore-wallet-client/package.json -COPY ./packages/bitcore-client/package.json ./packages/bitcore-client/package.json -COPY ./packages/bitcore-wallet/package.json ./packages/bitcore-wallet/package.json -COPY ./packages/bitcore-wallet-client/package.json ./packages/bitcore-wallet-client/package.json -COPY ./packages/bitcore-wallet-service/package.json ./packages/bitcore-wallet-service/package.json -COPY ./packages/bitcore-node/package.json ./packages/bitcore-node/package.json -COPY ./packages/insight/package.json ./packages/insight/package.json -COPY ./packages/crypto-wallet-core/package.json ./packages/crypto-wallet-core/package.json - -RUN ./node_modules/.bin/lerna bootstrap - -COPY . . -EXPOSE 3000 -EXPOSE 8100 -CMD ["./node_modules/.bin/lerna", "run", "start"] -#CMD ["npm", "--prefix=./packages/bitcore-node", "start"] -#CMD ["npm", "--prefix=./packages/insight", "start"] +COPY ./packages/bitcore-build/package.json ./packages/bitcore-build/package.json +COPY ./packages/bitcore-build/package-lock.json ./packages/bitcore-build/package-lock.json + +COPY ./packages/bitcore-lib-cash/package.json ./packages/bitcore-lib-cash/package.json +COPY ./packages/bitcore-lib-cash/package-lock.json ./packages/bitcore-lib-cash/package-lock.json + +COPY ./packages/bitcore-lib/package.json ./packages/bitcore-lib/package.json +COPY ./packages/bitcore-lib/package-lock.json ./packages/bitcore-lib/package-lock.json + +COPY ./packages/bitcore-mnemonic/package.json ./packages/bitcore-mnemonic/package.json +COPY ./packages/bitcore-mnemonic/package-lock.json ./packages/bitcore-mnemonic/package-lock.json + +COPY ./packages/bitcore-node/package.json ./packages/bitcore-node/package.json +COPY ./packages/bitcore-node/package-lock.json ./packages/bitcore-node/package-lock.json + +COPY ./packages/bitcore-p2p-cash/package.json ./packages/bitcore-p2p-cash/package.json +COPY ./packages/bitcore-p2p-cash/package-lock.json ./packages/bitcore-p2p-cash/package-lock.json + +COPY ./packages/bitcore-p2p/package.json ./packages/bitcore-p2p/package.json +COPY ./packages/bitcore-p2p/package-lock.json ./packages/bitcore-p2p/package-lock.json + +COPY ./packages/bitcore-wallet-client/package.json ./packages/bitcore-wallet-client/package.json +COPY ./packages/bitcore-wallet-client/package-lock.json ./packages/bitcore-wallet-client/package-lock.json + +COPY ./packages/bitcore-wallet-service/package.json ./packages/bitcore-wallet-service/package.json +COPY ./packages/bitcore-wallet-service/package-lock.json ./packages/bitcore-wallet-service/package-lock.json + +COPY ./packages/bitcore-wallet/package.json ./packages/bitcore-wallet/package.json +COPY ./packages/bitcore-wallet/package-lock.json ./packages/bitcore-wallet/package-lock.json + +COPY ./packages/insight/package.json ./packages/insight/package.json +COPY ./packages/insight/package-lock.json ./packages/insight/package-lock.json + +COPY ./packages/crypto-wallet-core/package.json ./packages/crypto-wallet-core/package.json +COPY ./packages/crypto-wallet-core/package-lock.json ./packages/crypto-wallet-core/package-lock.json + +COPY ./packages/bitcore-lib-ltc/package.json ./packages/bitcore-lib-ltc/package.json +COPY ./packages/bitcore-lib-ltc/package-lock.json ./packages/bitcore-lib-ltc/package-lock.json + + +RUN npm install +RUN npm run bootstrap +ADD . . +RUN npm run compile diff --git a/Dockerfile-test b/Dockerfile-test deleted file mode 100644 index 7dbdd1724f1..00000000000 --- a/Dockerfile-test +++ /dev/null @@ -1,78 +0,0 @@ -FROM node:10 - -# Install Chrome - -RUN echo 'deb http://dl.google.com/linux/chrome/deb/ stable main' > /etc/apt/sources.list.d/chrome.list - -RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - - -RUN set -x \ - && apt-get update \ - && apt-get install -y \ - google-chrome-stable - -ENV CHROME_BIN /usr/bin/google-chrome - -# Log versions - -RUN set -x \ - && node -v \ - && npm -v \ - && google-chrome --version - - -RUN npm i -g npm@6.4.1 - -WORKDIR /bitcore - -# Add source -COPY lerna.json ./ -COPY package*.json ./ - -COPY ./packages/bitcore-client/package.json ./packages/bitcore-client/package.json -COPY ./packages/bitcore-client/package-lock.json ./packages/bitcore-client/package-lock.json - -COPY ./packages/bitcore-build/package.json ./packages/bitcore-build/package.json -COPY ./packages/bitcore-build/package-lock.json ./packages/bitcore-build/package-lock.json - -COPY ./packages/bitcore-lib-cash/package.json ./packages/bitcore-lib-cash/package.json -COPY ./packages/bitcore-lib-cash/package-lock.json ./packages/bitcore-lib-cash/package-lock.json - -COPY ./packages/bitcore-lib/package.json ./packages/bitcore-lib/package.json -COPY ./packages/bitcore-lib/package-lock.json ./packages/bitcore-lib/package-lock.json - -COPY ./packages/bitcore-mnemonic/package.json ./packages/bitcore-mnemonic/package.json -COPY ./packages/bitcore-mnemonic/package-lock.json ./packages/bitcore-mnemonic/package-lock.json - -COPY ./packages/bitcore-node/package.json ./packages/bitcore-node/package.json -COPY ./packages/bitcore-node/package-lock.json ./packages/bitcore-node/package-lock.json - -COPY ./packages/bitcore-p2p-cash/package.json ./packages/bitcore-p2p-cash/package.json -COPY ./packages/bitcore-p2p-cash/package-lock.json ./packages/bitcore-p2p-cash/package-lock.json - -COPY ./packages/bitcore-p2p/package.json ./packages/bitcore-p2p/package.json -COPY ./packages/bitcore-p2p/package-lock.json ./packages/bitcore-p2p/package-lock.json - -COPY ./packages/bitcore-wallet-client/package.json ./packages/bitcore-wallet-client/package.json -COPY ./packages/bitcore-wallet-client/package-lock.json ./packages/bitcore-wallet-client/package-lock.json - -COPY ./packages/bitcore-wallet-service/package.json ./packages/bitcore-wallet-service/package.json -COPY ./packages/bitcore-wallet-service/package-lock.json ./packages/bitcore-wallet-service/package-lock.json - -COPY ./packages/bitcore-wallet/package.json ./packages/bitcore-wallet/package.json -COPY ./packages/bitcore-wallet/package-lock.json ./packages/bitcore-wallet/package-lock.json - -COPY ./packages/insight/package.json ./packages/insight/package.json -COPY ./packages/insight/package-lock.json ./packages/insight/package-lock.json - -COPY ./packages/crypto-wallet-core/package.json ./packages/crypto-wallet-core/package.json -COPY ./packages/crypto-wallet-core/package-lock.json ./packages/crypto-wallet-core/package-lock.json - -COPY ./packages/bitcore-lib-ltc/package.json ./packages/bitcore-lib-ltc/package.json -COPY ./packages/bitcore-lib-ltc/package-lock.json ./packages/bitcore-lib-ltc/package-lock.json - - -RUN npm install -RUN npm run bootstrap -ADD . . -RUN npm run compile diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 998e77f2adc..9dd30ad0679 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -5,7 +5,7 @@ services: test_runner: build: context: . - dockerfile: Dockerfile-test + dockerfile: Dockerfile ports: - 8100:8100 - 3000:3000