Merge pull request #9736 from vector-im/travis/docker-test
Make Dockerfile work for develop and other branchespull/9766/head
commit
6f8c6bf13e
|
@ -15,7 +15,7 @@ WORKDIR /src
|
|||
|
||||
COPY . /src
|
||||
RUN dos2unix /src/scripts/docker-link-repos.sh && sh /src/scripts/docker-link-repos.sh
|
||||
RUN yarn install
|
||||
RUN yarn --network-timeout=100000 install
|
||||
RUN yarn build
|
||||
|
||||
# Copy the config now so that we don't create another layer in the app image
|
||||
|
|
|
@ -13,7 +13,7 @@ git clone $JS_SDK_REPO js-sdk
|
|||
cd js-sdk
|
||||
git checkout $JS_SDK_BRANCH
|
||||
yarn link
|
||||
yarn install
|
||||
yarn --network-timeout=100000 install
|
||||
cd ../
|
||||
|
||||
echo "Linking react-sdk"
|
||||
|
@ -22,7 +22,7 @@ cd react-sdk
|
|||
git checkout $REACT_SDK_BRANCH
|
||||
yarn link
|
||||
yarn link matrix-js-sdk
|
||||
yarn install
|
||||
yarn --network-timeout=100000 install
|
||||
cd ../
|
||||
|
||||
echo "Setting up riot-web with react-sdk and js-sdk packages"
|
||||
|
|
Loading…
Reference in New Issue