Remove docker-related config. test:acceptance:docker now depends on acceptance-test-runner-sharelatex.

This commit is contained in:
Shane Kilkelly 2016-07-18 11:09:04 +01:00
parent 02b7b7baf2
commit 39cc9cda6d
3 changed files with 5 additions and 52 deletions

View file

@ -1,14 +0,0 @@
FROM ubuntu
COPY ./test/acceptance/scripts/docker-entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
RUN apt-get update && apt-get upgrade -y
RUN apt-get install -y build-essential redis-server mongodb-server nodejs npm
RUN ln -s /usr/bin/nodejs /usr/bin/node
RUN npm install -g grunt-cli
RUN mkdir /document-updater
VOLUME /document-updater
ENTRYPOINT /entrypoint.sh

View file

@ -71,18 +71,7 @@ module.exports = (grunt) ->
shell:
fullAcceptanceTests:
command: "bash ./test/acceptance/scripts/full-test.sh"
buildDockerImage:
command: """
if [ -z $(docker images | awk \'{ print $1 }\' | grep sharelatex-docupdater-tests) ];
then
docker build -t sharelatex-docupdater-tests .;
else
echo ">> docker image \'sharelatex-docupdater-tests\' already exists";
fi
"""
dockerTests:
command: 'docker run -v "$(pwd):/document-updater" --rm --name doc-updater-test sharelatex-docupdater-tests'
dockerTests2:
command: 'docker run -v "$(pwd):/app" --rm sl-acceptance-test-runner'
availabletasks:
@ -135,21 +124,11 @@ module.exports = (grunt) ->
"Start server and run acceptance tests",
['shell:fullAcceptanceTests']
)
grunt.registerTask(
'test:acceptance:buildDockerImage',
"Build docker image for acceptance tests",
['shell:buildDockerImage']
)
grunt.registerTask(
'test:acceptance:docker',
"Run acceptance tests inside docker container",
['shell:buildDockerImage', 'shell:dockerTests']
)
grunt.registerTask(
'test:acceptance:docker2',
"Run acceptance tests inside docker container",
['shell:dockerTests2']
['shell:dockerTests']
)
grunt.registerTask 'test:acceptance', 'Run the acceptance tests (use --grep=<regex> for individual tests)', ['compile:acceptance_tests', 'mochaTest:acceptance']

View file

@ -1,12 +0,0 @@
#! /usr/bin/env bash
service redis-server start
service mongodb start
cd /document-updater
npm install
source ./test/acceptance/scripts/full-test.sh
exit 0