gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #9736 from vector-im/travis/docker-test 

Make Dockerfile work for develop and other branches
This commit is contained in:
Travis Ralston 2019-05-16 08:43:44 -06:00 committed by GitHub
parent 45e8c26864 3123b429f7
commit 6f8c6bf13e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -15,7 +15,7 @@ WORKDIR /src
COPY . /src COPY . /src
RUN dos2unix /src/scripts/docker-link-repos.sh && sh /src/scripts/docker-link-repos.sh 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 RUN yarn build
# Copy the config now so that we don't create another layer in the app image # Copy the config now so that we don't create another layer in the app image

4
scripts/docker-link-repos.sh
View File

@ -13,7 +13,7 @@ git clone $JS_SDK_REPO js-sdk
cd js-sdk cd js-sdk
git checkout $JS_SDK_BRANCH git checkout $JS_SDK_BRANCH
yarn link yarn link
yarn install yarn --network-timeout=100000 install
cd ../ cd ../
echo "Linking react-sdk" echo "Linking react-sdk"
@ -22,7 +22,7 @@ cd react-sdk
git checkout $REACT_SDK_BRANCH git checkout $REACT_SDK_BRANCH
yarn link yarn link
yarn link matrix-js-sdk yarn link matrix-js-sdk
yarn install yarn --network-timeout=100000 install
cd ../ cd ../
echo "Setting up riot-web with react-sdk and js-sdk packages" echo "Setting up riot-web with react-sdk and js-sdk packages"