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

working on xvfb tests in docker

上级 f16abc79
FROM node:6
# RUN mkdir /tmp/.X11-unix/ && chmod 777 /tmp/.X11-unix/
RUN apt-get update && apt-get install -y \
apt-utils \
dbus-x11 \
xvfb
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
......@@ -10,7 +12,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
&& apt-get install -y google-chrome-stable \
&& google-chrome --version
RUN groupadd -r wechaty && useradd -m -r -g wechaty wechaty -d /wechaty
# RUN groupadd -r wechaty && useradd -m -r -g wechaty wechaty -d /wechaty
WORKDIR /wechaty
COPY package.json .
......@@ -23,5 +25,5 @@ RUN npm link \
ENTRYPOINT [ "/wechaty/entrypoint.sh" ]
CMD [ "start" ]
RUN chown -R wechaty.wechaty /wechaty
USER wechaty
# RUN chown -R wechaty.wechaty /wechaty
# USER wechaty
......@@ -3,7 +3,9 @@
# Credit: https://github.com/cusspvz/node.docker/blob/master/entrypoint
#
echo "Docker Starting Wechaty v$(wechaty-version)"
echo
echo "Starting Wechaty v$(wechaty-version) ..."
echo
# to identify run env (for tests)
export WECHATY_DOCKER='docker'
......@@ -15,7 +17,7 @@ echo "WECHATY_HEAD=$WECHATY_HEAD"
if [ "$WECHATY_HEAD" != "phantomjs" ]; then
export DISPLAY=':99.0'
Xvfb :99 -screen 0 1024x768x24 &
Xvfb :99 -ac -screen 0 640x480x8 -nolisten tcp &
echo "Xvfb started on DISPLAY=$DISPLAY"
fi
......
......@@ -15,7 +15,7 @@
"pretest": "npm run lint",
"start": "node bin/io-bot",
"demo": "node example/ding-dong-bot.js",
"test": "cross-env LC_ALL=C WECHATY_LOG=info ava --timeout=10m \"{src,test}/**/*.spec.js\"",
"test": "cross-env LC_ALL=C WECHATY_LOG=info ava --serial --timeout=10m \"{src,test}/**/*.spec.js\"",
"testdev": "cross-env LC_ALL=C WECHATY_LOG=silly ava --verbose --fail-fast --timeout=3m"
},
"repository": {
......
......@@ -8,6 +8,9 @@
[ "$DISPLAY" = "" ] && {
export DISPLAY=':99.0'
echo "Set DISPLAY to $DISPLAY"
}
[ "$(ps a | grep Xvfb | grep -v grep | wc -l)" = 0 ] && {
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
echo "Xvfb started"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册