diff --git a/.travis.yml b/.travis.yml index 2ad908af524905d8cd410720272087e2eb801aab..195d9d9df421ae2b841ec104acd26dde6ffba0f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,13 +19,16 @@ cache: services: - docker +before_install: + - "npm config set progress=false" + install: - if [ "$TRAVIS_OS_NAME" == 'osx' ]; then brew update; brew cleanup; brew cask cleanup; fi - if [ "$TRAVIS_OS_NAME" == 'osx' ]; then brew uninstall --force brew-cask; brew update; fi - if [ "$TRAVIS_OS_NAME" == 'osx' ]; then brew cask install --force google-chrome; fi - if [ "$TRAVIS_OS_NAME" == 'linux' ]; then export DISPLAY=':99.0'; fi - - if [ "$TRAVIS_OS_NAME" == 'linux' ]; then (Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &); fi + - if [ "$TRAVIS_OS_NAME" == 'linux' ]; then (Xvfb :99 -screen 0 640x480x8 > /dev/null 2>&1 &); fi - npm install @@ -33,7 +36,7 @@ script: - echo $TRAVIS_OS_NAME - npm test - if [ "$TRAVIS_OS_NAME" == "linux" ]; then docker build -t zixia/wechaty:test .; fi - - if [ "$TRAVIS_OS_NAME" == "linux" ]; then docker run --shm-size 256m zixia/wechaty:test test; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then docker run -v /dev/shm:/dev/shm zixia/wechaty:test test; fi notifications: webhooks: diff --git a/Dockerfile b/Dockerfile index 6bfc33e70e1da5dbd802cdc14c402396f9eea0f4..13a9154602ea3412408fbce54cae3d5a6c9126aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,23 @@ FROM node:6 +RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ + && sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' + RUN apt-get update && apt-get install -y \ apt-utils \ chromium \ + google-chrome-stable \ vim \ xvfb -RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ - && sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ - && apt-get update \ - && apt-get install -y google-chrome-stable \ - && google-chrome --version - WORKDIR /wechaty + COPY package.json . -RUN npm install --loglevel warn && rm -fr /tmp/* +RUN npm set progress=false \ + && npm install --loglevel warn \ + && rm -fr /tmp/* COPY . . RUN npm link ENTRYPOINT [ "/wechaty/bin/entrypoint.sh" ] CMD [ "start" ] - diff --git a/script/build-docker.sh b/script/build-docker.sh index 7e00424b3c7757fba9270b89b56f75bba6e3e7ca..7913d8a4208476de1fd839d1c72252e5288d9715 100755 --- a/script/build-docker.sh +++ b/script/build-docker.sh @@ -4,4 +4,4 @@ if [ "$1" = "build" ] || [ "$1" = "" ]; then exec docker build -t zixia/wechaty:test . fi -exec docker run --shm-size 256m -ti --rm zixia/wechaty:test $1 +exec docker run -v /dev/shm:/dev/shm -ti --rm zixia/wechaty:test $1