Permalink
Browse files

docker fixes, including using a later version of chromedriver

  • Loading branch information...
starpit committed Nov 5, 2017
1 parent d173237 commit f151b1c2cfaec00ec2cd3d8403633b3f86a3da94
Showing with 29 additions and 2 deletions.
  1. +4 −0 Dockerfile
  2. +12 −1 tests/bin/runLocal.sh
  3. +2 −0 tests/docker/.gitignore
  4. +2 −0 tests/docker/Dockerfile
  5. +9 −1 tests/docker/build.sh
View
@@ -1,4 +1,5 @@
FROM shell-test-base
#FROM starpit/ibm-functions-shell-base
WORKDIR /tests
@@ -20,4 +21,7 @@ RUN rm ~/.wskprops
ADD tests /tests
RUN cd /tests && npm install
# fold in the latest chromedriver; this file is part of the base image see tests/docker/build.sh,Dockerfile
RUN mv /chromedriver /tests/node_modules/electron-chromedriver/bin
CMD ./bin/runWithXvfb.sh
View
@@ -61,7 +61,18 @@ fi
rm logs/* 2> /dev/null
# which tests to run; the default is every test
WHICH=${@-tests/passes/*}
if [ -n "$LAYER" ]; then
# a single layer, specified by env var
WHICH=tests/passes/$LAYER
elif [ "$#" -ne 0 ]; then
# one or more layers, specified on command line
for i in $@; do
WHICH=" $WHICH tests/passes/$i"
done
else
# all layers
WHICH=tests/passes/*
fi
idx=1
for i in $WHICH; do
View
@@ -0,0 +1,2 @@
chromedriver_linux64.zip
chromedriver
View
@@ -5,3 +5,5 @@ FROM node:8.9-slim
RUN apt-get update \
&& apt-get install -y \
bash git dbus dbus-x11 xvfb make g++ libnss3 libasound2 libgconf-2-4 libxtst6 libxss1 libgtk2.0-0
ADD chromedriver /chromedriver
View
@@ -1,3 +1,11 @@
#!/usr/bin/env bash
docker build -t shell-test-base .
TAG=shell-test-base
#TAG=starpit/ibm-functions-shell-base # sometimes helpful for local deployment
# fetch a later version of chromedriver; spectron is pegged currently at 2.27
curl -O https://chromedriver.storage.googleapis.com/2.33/chromedriver_linux64.zip \
&& unzip chromedriver_linux64.zip \
&& rm chromedriver_linux64.zip
docker build -t $TAG .

0 comments on commit f151b1c

Please sign in to comment.