From 39cc9cda6d09bdbc4687a5a1488024f98ec5034a Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Mon, 18 Jul 2016 11:09:04 +0100
Subject: [PATCH] Remove docker-related config. `test:acceptance:docker` now
 depends on `acceptance-test-runner-sharelatex`.

---
 services/document-updater/Dockerfile          | 14 ---------
 services/document-updater/Gruntfile.coffee    | 31 +++----------------
 .../acceptance/scripts/docker-entrypoint.sh   | 12 -------
 3 files changed, 5 insertions(+), 52 deletions(-)
 delete mode 100644 services/document-updater/Dockerfile
 delete mode 100644 services/document-updater/test/acceptance/scripts/docker-entrypoint.sh

diff --git a/services/document-updater/Dockerfile b/services/document-updater/Dockerfile
deleted file mode 100644
index b92c7d35f1..0000000000
--- a/services/document-updater/Dockerfile
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/services/document-updater/Gruntfile.coffee b/services/document-updater/Gruntfile.coffee
index 96b1be22fd..042fe32ce2 100644
--- a/services/document-updater/Gruntfile.coffee
+++ b/services/document-updater/Gruntfile.coffee
@@ -22,7 +22,7 @@ module.exports = (grunt) ->
 			strict: false
 
 		coffee:
-			app_dir: 
+			app_dir:
 				expand: true,
 				flatten: false,
 				cwd: 'app/coffee',
@@ -30,7 +30,7 @@ module.exports = (grunt) ->
 				dest: 'app/js/',
 				ext: '.js'
 
-			app: 
+			app:
 				src: 'app.coffee'
 				dest: 'app.js'
 
@@ -42,7 +42,7 @@ module.exports = (grunt) ->
 				dest: 'test/acceptance/js/',
 				ext: '.js'
 
-			unit_tests: 
+			unit_tests:
 				expand: true,
 				flatten: false,
 				cwd: 'test/unit/coffee',
@@ -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']
diff --git a/services/document-updater/test/acceptance/scripts/docker-entrypoint.sh b/services/document-updater/test/acceptance/scripts/docker-entrypoint.sh
deleted file mode 100644
index 54a12c0468..0000000000
--- a/services/document-updater/test/acceptance/scripts/docker-entrypoint.sh
+++ /dev/null
@@ -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