re-enable docker tests in travis

docker-travis
John McLear 2020-10-06 13:29:26 +01:00
parent 52f8fc9ba3
commit edf86b76c8
1 changed files with 14 additions and 16 deletions

View File

@ -47,14 +47,13 @@ jobs:
- "cd src && npm install && cd -" - "cd src && npm install && cd -"
script: script:
- "tests/frontend/travis/runnerBackend.sh" - "tests/frontend/travis/runnerBackend.sh"
## Temporarily commented out the Dockerfile tests - name: "Test the Dockerfile"
# - name: "Test the Dockerfile" install:
# install: - "cd src && npm install && cd -"
# - "cd src && npm install && cd -" script:
# script: - "docker build -t etherpad:test ."
# - "docker build -t etherpad:test ." - "docker run -d -p 9001:9001 etherpad:test && sleep 3"
# - "docker run -d -p 9001:9001 etherpad:test && sleep 3" - "cd src && npm run test-container"
# - "cd src && npm run test-container"
- name: "Load test Etherpad without Plugins" - name: "Load test Etherpad without Plugins"
install: install:
- "bin/installDeps.sh" - "bin/installDeps.sh"
@ -83,14 +82,13 @@ jobs:
- "cd src && npm install && cd -" - "cd src && npm install && cd -"
script: script:
- "tests/frontend/travis/runnerBackend.sh" - "tests/frontend/travis/runnerBackend.sh"
## Temporarily commented out the Dockerfile tests - name: "Test the Dockerfile"
# - name: "Test the Dockerfile" install:
# install: - "cd src && npm install && cd -"
# - "cd src && npm install && cd -" script:
# script: - "docker build -t etherpad:test ."
# - "docker build -t etherpad:test ." - "docker run -d -p 9001:9001 etherpad:test && sleep 3"
# - "docker run -d -p 9001:9001 etherpad:test && sleep 3" - "cd src && npm run test-container"
# - "cd src && npm run test-container"
- name: "Load test Etherpad with Plugins" - name: "Load test Etherpad with Plugins"
install: install:
- "bin/installDeps.sh" - "bin/installDeps.sh"