提交 e82be8c8 编写于 作者: Huan (李卓桓)'s avatar Huan (李卓桓)

docker code clean up

上级 310fc25a
......@@ -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:
......
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" ]
......@@ -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
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册