Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Run Selenium in Docker #163

Closed
wants to merge 117 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
da5ffc2
ADD: Docker support to example project
Jul 8, 2016
dc269a2
Added ulimit increase, removed node_modules/jspm_packages from volume…
Jul 9, 2016
c2206db
Try enable polling, add some console logs, added line in Dockerfile f…
Jul 12, 2016
84d7ba3
Change `src` to `code` so the folder isn't ignored by the watcher
Jul 12, 2016
65aba8f
Revert changes from debugging
Jul 12, 2016
dca03b4
Remove chokidar polling env variable
Jul 12, 2016
52d8b4b
Add comment on ARG in dockerfile
Jul 12, 2016
690a774
Add wildcat.localhost to dns search
Jul 12, 2016
7292c39
Point all localhost tlds to containers
Jul 12, 2016
0e60181
Added documentation for docker-compose
Jul 12, 2016
e22ef55
Added example production docker-compose file, added Dockerfile to roo…
Jul 13, 2016
7dad5bb
Fixed test, added .dockerIgnore
Jul 14, 2016
412ed5b
Change host name from example.localhost to www.example.localhost (ssl…
Jul 14, 2016
caf46c7
Change .travis.yml to use docker
Jul 14, 2016
4822755
Fix rm command for travis
Jul 14, 2016
3e8e6d4
Add more instructions to README, fix docker_version in travis
Jul 14, 2016
a249f27
Maybe adding quotes will fix the variable in Travis?
Jul 14, 2016
3137e7e
Move env declaration for travis
Jul 14, 2016
682236f
Changed env variable format in .travis.yml
Jul 14, 2016
5c8e972
Change docker version in travis.yml to a valid one in the ubuntu apt …
Jul 14, 2016
1ca899c
Package name for docker is docker-engine.
Jul 14, 2016
3552065
Try removing the docker version....
Jul 14, 2016
d2d32ec
Force yes on apt-get install
Jul 14, 2016
d561bcc
Force yes for docker install
Jul 14, 2016
7689e82
Revert .travis.yml as travis doesn't support caching docker images at…
Jul 14, 2016
275d8d5
Fixed line endings
Jul 14, 2016
32d95cf
Change localhost to static.example.localhost in tests
Jul 15, 2016
ed08148
Make default hose static.example.localhost
Jul 15, 2016
5b36340
Change default from localhost to www.example.localhost
Jul 18, 2016
fe83b69
Reverted jspm line in package.json
Jul 18, 2016
2acccdc
Merge branch 'master' into feature/docker
Jul 22, 2016
9261e97
Add docker back to travis to see if it increases code coverage due to…
Jul 22, 2016
4c1ecc0
Fix .travis.yml file
Jul 22, 2016
2ce9b45
Fix indentation for travis yml
Jul 22, 2016
eed31be
Try to leverage Travis caching by moving the make install step to run…
Jul 22, 2016
844f6d7
Use up command
Jul 22, 2016
3653827
Try removing volumes?
Jul 22, 2016
5103d50
Add default entrypoint to dockerfile
Jul 22, 2016
f2a3010
Change travis docker run command
Jul 22, 2016
7855ca5
Move jspm install to its own line
Jul 22, 2016
f7cbb2f
Add CI environment variable for travis builds
Jul 22, 2016
72acd48
Add travis env variables
Jul 22, 2016
70abf22
Debug copy command on travis
Jul 22, 2016
9c09cfa
Bring back volumes...
Jul 22, 2016
3fd0df4
Add travis env variables as args in dockerfile
Jul 22, 2016
72577f7
Remove docker-compose build
Jul 22, 2016
3325757
Move docker build step to the script phase
Jul 25, 2016
af36ed9
Remove make test-travis from Dockerfile
Jul 25, 2016
16c438a
Remove cached directories to try to speed up docker copy command
Jul 25, 2016
3827f1a
Change jspm cli package to NFL fork
Jul 25, 2016
58975d7
Add --rm and --service-ports to docker-compose run to get the right e…
Jul 25, 2016
ca5e6a0
Merge branch 'master' into feature/docker
Jul 25, 2016
7bf3bfd
Test removing lint step for travis
Jul 25, 2016
6c8bcf5
Add clean to test-travis to see if the issue is due to system links
Jul 25, 2016
6dd0df8
Add clean to test-travis to see if the issue is due to system links
Jul 25, 2016
aeefddd
Make sure image is built on every push
Jul 25, 2016
98aed47
Install optional deps
Jul 25, 2016
f8571d5
Add jspm install command
Jul 25, 2016
e2e251f
Do not filter jspm logs
Jul 25, 2016
7f89a42
Revert travis file, try setting hosts via travis
Jul 26, 2016
4ba8e08
Revert changes that weren't affecting the build
Jul 26, 2016
9f61a8c
Merge run commands into one command to save a layer
Jul 26, 2016
945a351
Fixed error in docker run command
Jul 26, 2016
1b5d96d
Merge branch 'master' into feature/docker
Aug 24, 2016
54829e8
Programatically add ssl cert to the OS, still figuring out dns issues
Aug 25, 2016
d299089
Add SSL cert to selenium container. wget works in selenium container …
Aug 25, 2016
7ecba0a
Change example.localhost to example.dev, since chrome will resolve *.…
Aug 26, 2016
25008ee
Setup dnsmasq, added a note in the readme to get dns working! :)
Aug 27, 2016
f5c6b37
Fix .travis.yml
Aug 27, 2016
1abc431
Fix eslint dependency. Add note about .localhost
Aug 29, 2016
e2bb1b8
Remove commented out code
Aug 29, 2016
17901c3
Fixed lint errors
Aug 29, 2016
18b6c13
Merged changes from master
jamsea Sep 17, 2016
b238d25
Merged master changes
Sep 20, 2016
1b528fc
Merge branch 'feature/docker' of https://github.com/nfl/react-wildcat…
Sep 20, 2016
8dddef7
Fix e2e run by adding it as a command in docker-compose.override.yml
Sep 21, 2016
ecca8b9
Merge branch 'master' into feature/docker
Sep 22, 2016
87f646f
Got linter working in docker
Sep 22, 2016
4e5129d
Get docker branch working outside of docker
Sep 23, 2016
4d74486
Merge branch 'master' into feature/docker
Sep 23, 2016
8ee282d
Change hostname to localhost if running outside of docker
Sep 27, 2016
a6d2820
Remove object.assign
Sep 27, 2016
3af6c33
Add ability to set hostname via environment variable in example project
Sep 27, 2016
77b42a4
Upgraded node, fixed lint warning for shadow
Sep 28, 2016
0ad26c0
Revert eslintrc
Sep 28, 2016
ec08404
Upgrade jspm cli
Sep 28, 2016
27fc124
fix(react-wildcat-handoff): Update Webpack config
Sep 28, 2016
c9b586d
chore(example): Lock [email protected]
Sep 28, 2016
38dbda3
Fix webpack issue
Sep 29, 2016
599a593
Modified package.json
Sep 29, 2016
09b4d18
Clean up travis.yml
Sep 29, 2016
8a7ceb0
Fixed eslint and node version
Sep 29, 2016
3330efe
Try removing cached directories
Sep 30, 2016
6c62b34
Revert travis.yml back
Sep 30, 2016
e557223
Try upgrading npm?
Sep 30, 2016
4b72bef
Try reverting node in travis
Sep 30, 2016
8c2c93c
Try this node version....
Sep 30, 2016
d6ae71c
Pin to 6.7.0, as travis is having issues with 6.6.0
Sep 30, 2016
3163863
Set default selenium address
Oct 4, 2016
b60ad79
Revert previous commit
Oct 4, 2016
d47a11e
Update clang
Oct 4, 2016
3b8ab75
Revert node version and remove cache
Oct 4, 2016
af5ccec
Fix travis file
Oct 4, 2016
2eb0996
Add cache back to travis
Oct 4, 2016
4070fda
Fix webpack config error and detDefaultSSLFile logic
Oct 4, 2016
5ad41e5
Check host name rather than docker
Oct 5, 2016
92e514e
Change docker check to localhost check
Oct 5, 2016
f59bb48
Move config to wildcat.config.js
Oct 5, 2016
68db6e3
Revert node version to 4.4.4
Oct 5, 2016
4effc04
Remove npm run build step
Oct 5, 2016
748854d
Bump to 6.3.1
Oct 5, 2016
0f9bfe2
Make sure build step is run
Oct 5, 2016
adf1c33
Fix ssl logic, docker-compose failures
Oct 5, 2016
13899d8
Fix wildcat.config.js
Oct 5, 2016
07f45ee
Remove console.log's
Oct 6, 2016
03e08a5
Change default command to dev
Oct 6, 2016
f76f54b
Fix merge conflicts
Oct 7, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions example/docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ version: '2'
services:
wildcat:
depends_on:
- selenium
- dnsmasq
dns_search:
- static.example.dev
Expand All @@ -21,6 +22,21 @@ services:
- ./src:/code/src
command: "dev"

selenium:
dns_search:
- selenium.example.dev
build:
context: ./ssl
image: nfl/standalone-chrome-debug:2.52.0
environment:
no_proxy: ""
volumes:
- /tmp:/e2e/uploads
- /dev/shm:/dev/shm
ports:
- "4444:4444"
- "6900:5900"

dnsmasq:
image: andyshinn/dnsmasq:2.76
restart: always
Expand Down
10 changes: 10 additions & 0 deletions example/ssl/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM selenium/standalone-chrome-debug:2.53.0

RUN apt-get update && apt-get install -y libnss3-tools

COPY example.crt /usr/local/share/ca-certificates
COPY example.crt /etc/ssl/certs
COPY example.key /etc/ssl/private

RUN mkdir -p $HOME/.pki/nssdb && certutil -d $HOME/.pki/nssdb -N
RUN certutil -d sql:$HOME/.pki/nssdb -A -t "C,," -n "*.example.dev" -i /etc/ssl/certs/example.crt