Skip to content
This repository has been archived by the owner on Dec 13, 2019. It is now read-only.

Commit

Permalink
merged greenboard image into circleci-env image
Browse files Browse the repository at this point in the history
  • Loading branch information
joelalejandro committed Sep 11, 2019
1 parent 275e7a7 commit e8fe399
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ orbs:
defaults: &defaults
working_directory: /home/circleci/project
docker:
- image: counterfactual/circleci-environment:latest
- image: counterfactual/circleci-environment:greenboard-test

save_code: &save_code
save_cache:
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:

run-greenboard:
docker:
- image: counterfactual/greenboard-environment:latest
- image: counterfactual/circleci-environment:greenboard-test
environment:
METAMASK_REPOSITORY: prototypal/metamask-extension
METAMASK_BRANCH: develop
Expand Down
20 changes: 15 additions & 5 deletions .circleci/images/build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,18 @@ RUN apt-get install -y solc

# install node 10.x and yarn 1.10.x
RUN apt-get install -y curl && \
curl -sL https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.15.3-1nodesource1_amd64.deb > nodejs-10.15.3.deb && \
dpkg -i nodejs-10.15.3.deb && \
rm /usr/local/bin/node && \
npm install -g yarn@1.12.3 && \
rm /usr/local/bin/yarn
curl -sL https://deb.nodesource.com/node_10.x/pool/main/n/nodejs/nodejs_10.15.3-1nodesource1_amd64.deb > nodejs-10.15.3.deb && \
dpkg -i nodejs-10.15.3.deb && \
rm /usr/local/bin/node && \
npm install -g yarn@1.12.3 && \
rm /usr/local/bin/yarn

# environment variables for greenboard
ENV CHROME_DRIVER_PATH=/usr/bin/chromedriver
ENV CHROME_BINARY_PATH=/usr/bin/chromium-browser
ENV NODE_EXTENDED_PRIVATE_KEY=xprv9s21ZrQH143K3SUeRQphNwVqZc2hJg3bZiNQwbMyTGcyDuLXay2xWCMDmC2Tu8JHiCGbyy3rYjVq4LRYZ716Yn1WSkMUx2VzpgJr79g3iEt
ENV TEST_BROWSER_FLAG_DEBUG=#
ENV TEST_BROWSER_FLAG_DISABLE_GPU=#

# Install browser, driver and X virtual framebuffer
RUN apt-get install -y chromium-browser chromium-chromedriver xvfb
1 change: 1 addition & 0 deletions packages/greenboard/ci-run-tests.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
NODE_ENV=test
YARN_OP_FLAGS="--ignore-engines"
YARN_BUILD_FLAGS="$YARN_OP_FLAGS --build-from-source"
alias yarn_install_command="yarn $YARN_BUILD_FLAGS"
Expand Down

0 comments on commit e8fe399

Please sign in to comment.