From 0938ca7fa8544e6b2ef2d914b75b99bee1157f19 Mon Sep 17 00:00:00 2001 From: Adam Miskiewicz Date: Mon, 15 May 2017 20:07:37 -0700 Subject: [PATCH] Add watchman to docker image --- packages/react-navigation/circle.yml | 4 ++-- .../react-navigation/scripts/build-push-docker.sh | 4 ++-- packages/react-navigation/scripts/ci.Dockerfile | 12 ++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/react-navigation/circle.yml b/packages/react-navigation/circle.yml index 3ff1d685..ba88763d 100644 --- a/packages/react-navigation/circle.yml +++ b/packages/react-navigation/circle.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: reactcommunity/node-ci:7.10.0-0 # custom image -- includes ocaml, libelf1, Yarn + - image: reactcommunity/node-ci:7.10.0-1 # custom image -- includes ocaml, libelf1, Yarn parallelism: 3 working_directory: ~/react-navigation steps: @@ -21,7 +21,7 @@ jobs: # deploy expo playground demo exp login -u "$EXPO_USERNAME" -p "$EXPO_PASSWORD" - cd examples/NavigationPlayground && yarn && exp publish + cd examples/NavigationPlayground && exp publish fi - save_cache: key: v2-react-navigation-{{ .Branch }} # generate cache per branch diff --git a/packages/react-navigation/scripts/build-push-docker.sh b/packages/react-navigation/scripts/build-push-docker.sh index 3bfce265..5021f8ae 100755 --- a/packages/react-navigation/scripts/build-push-docker.sh +++ b/packages/react-navigation/scripts/build-push-docker.sh @@ -2,5 +2,5 @@ set -eo pipefail -docker build -t reactcommunity/node-ci:7.10.0-0 -f ./ci.Dockerfile . -docker push reactcommunity/node-ci:7.10.0-0 +docker build -t reactcommunity/node-ci:7.10.0-1 -f ./ci.Dockerfile . +docker push reactcommunity/node-ci:7.10.0-1 diff --git a/packages/react-navigation/scripts/ci.Dockerfile b/packages/react-navigation/scripts/ci.Dockerfile index b858ae16..2a0c2cba 100644 --- a/packages/react-navigation/scripts/ci.Dockerfile +++ b/packages/react-navigation/scripts/ci.Dockerfile @@ -5,3 +5,15 @@ RUN apt-get update -y && \ rm -rf /var/lib/apt/lists/* && \ curl -o- -L https://yarnpkg.com/install.sh | bash && \ npm install -g exp + +RUN git clone https://github.com/facebook/watchman.git \ + && cd watchman \ + && git checkout v4.7.0 \ + && apt-get update -y \ + && apt-get install -y autoconf automake build-essential python-dev \ + && ./autogen.sh \ + && ./configure \ + && make \ + && make install \ + && apt-get remove --purge -y autoconf automake build-essential python-dev \ + && rm -rf /var/lib/apt/lists/*