Compare commits
2 Commits
develop
...
docker-tra
Author | SHA1 | Date |
---|---|---|
John McLear | 1aa5866545 | |
John McLear | edf86b76c8 |
30
.travis.yml
30
.travis.yml
|
@ -47,14 +47,13 @@ jobs:
|
|||
- "cd src && npm install && cd -"
|
||||
script:
|
||||
- "tests/frontend/travis/runnerBackend.sh"
|
||||
## Temporarily commented out the Dockerfile tests
|
||||
# - name: "Test the Dockerfile"
|
||||
# install:
|
||||
# - "cd src && npm install && cd -"
|
||||
# script:
|
||||
# - "docker build -t etherpad:test ."
|
||||
# - "docker run -d -p 9001:9001 etherpad:test && sleep 3"
|
||||
# - "cd src && npm run test-container"
|
||||
- name: "Test the Dockerfile"
|
||||
install:
|
||||
- "cd src && npm install && cd -"
|
||||
script:
|
||||
- "docker build -t etherpad:test ."
|
||||
- "docker run -d -p 9001:9001 etherpad:test && sleep 3"
|
||||
- "cd src && npm run test-container"
|
||||
- name: "Load test Etherpad without Plugins"
|
||||
install:
|
||||
- "bin/installDeps.sh"
|
||||
|
@ -83,14 +82,13 @@ jobs:
|
|||
- "cd src && npm install && cd -"
|
||||
script:
|
||||
- "tests/frontend/travis/runnerBackend.sh"
|
||||
## Temporarily commented out the Dockerfile tests
|
||||
# - name: "Test the Dockerfile"
|
||||
# install:
|
||||
# - "cd src && npm install && cd -"
|
||||
# script:
|
||||
# - "docker build -t etherpad:test ."
|
||||
# - "docker run -d -p 9001:9001 etherpad:test && sleep 3"
|
||||
# - "cd src && npm run test-container"
|
||||
- name: "Test the Dockerfile"
|
||||
install:
|
||||
- "cd src && npm install && cd -"
|
||||
script:
|
||||
- "docker build -t etherpad:test ."
|
||||
- "docker run -d -p 9001:9001 etherpad:test && sleep 3"
|
||||
- "cd src && npm run test-container"
|
||||
- name: "Load test Etherpad with Plugins"
|
||||
install:
|
||||
- "bin/installDeps.sh"
|
||||
|
|
|
@ -16,7 +16,7 @@ cd "${MY_DIR}/../../../"
|
|||
# This is possible because the "install" section of .travis.yml already contains
|
||||
# a call to bin/installDeps.sh
|
||||
echo "Running Etherpad directly, assuming bin/installDeps.sh has already been run"
|
||||
node node_modules/ep_etherpad-lite/node/server.js "${@}" &
|
||||
node node_modules/ep_etherpad-lite/node/server.js --experimental-worker "${@}" &
|
||||
|
||||
echo "Now I will try for 15 seconds to connect to Etherpad on http://localhost:9001"
|
||||
|
||||
|
|
Loading…
Reference in New Issue