Commit cb17710c authored by chickahoona's avatar chickahoona

minor adjustments to ci

parent b071d2bc
before_script:
- docker info
- /usr/local/bin/docker-compose -f docker-compose-test.yml kill
- /usr/local/bin/docker-compose -f docker-compose-test.yml rm -f
- /usr/local/bin/docker-compose -f docker-compose-test.yml build
build_image:
test_image_chrome:
script:
- /usr/local/bin/docker-compose -f docker-compose-test.yml kill
- /usr/local/bin/docker-compose -f docker-compose-test.yml rm -f
- /usr/local/bin/docker-compose -f docker-compose-test.yml build
- /usr/local/bin/docker-compose -f docker-compose-test.yml run password-client-image-test bash -c "(test -e /tmp/.X99-lock || /usr/bin/Xvfb :99 &) && karma start ./unittests/karma-chrome.conf.js"
- /usr/local/bin/docker-compose -f docker-compose-test.yml stop
#test_image_firefox:
# script:
# - /usr/local/bin/docker-compose -f docker-compose-test.yml run password-client-image-test bash -c "(test -e /tmp/.X99-lock || /usr/bin/Xvfb :99 &) && karma start ./unittests/karma-firefox.conf.js"
# - /usr/local/bin/docker-compose -f docker-compose-test.yml stop
\ No newline at end of file
......@@ -4,10 +4,8 @@ MAINTAINER Sascha Pfeiffer <saschapfeiffer@sanso.pw>
COPY . /root/
WORKDIR /root
RUN apt-get update && \
apt-get install -y nodejs npm xvfb chromium-browser && \
apt-get install -y nodejs npm xvfb chromium-browser firefox && \
ln -s /usr/bin/nodejs /usr/bin/node && \
export DISPLAY=:99.0 && \
export CHROME_BIN=/usr/bin/chromium-browser && \
npm install && \
npm install gulp -g && \
npm install karma-cli -g && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment