From 96a237fb749e1dfe9d9d264f4f2d66b73f51b17c Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Tue, 6 Mar 2018 10:30:05 +0000
Subject: [PATCH] removed user temporarly, created make ci task

---
 Dockerfile            |  2 +-
 Jenkinsfile           | 22 ++--------------------
 Makefile              | 12 ++++++++++++
 docker-compose.ci.yml |  9 +--------
 docker-compose.yml    |  6 ------
 5 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3387394..5826661 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,5 +23,5 @@ RUN useradd --user-group --create-home --home-dir /app --shell /bin/false app
 
 RUN [ -e ./install_deps.sh ] && ./install_deps.sh
 
-USER app
+# USER app
 CMD ["node","app.js"]
diff --git a/Jenkinsfile b/Jenkinsfile
index 993d22f..e92cfbe 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,27 +9,9 @@ pipeline {
   }
 
   stages {
-    stage('Build') {
+    stage('CI') {
       steps {
-        sh 'make build'
-      }
-    }
-
-    stage('Unit Tests') {
-      steps {
-        sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" make test_unit'
-      }
-    }
-
-    stage('Acceptance Tests') {
-      steps {
-        sh 'DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" up --build test_acceptance'
-      }
-    }
-
-    stage('Package and publish build') {
-      steps {
-        sh 'make publish'
+        sh 'make ci'
       }
     }
 
diff --git a/Makefile b/Makefile
index b20654c..450efc8 100644
--- a/Makefile
+++ b/Makefile
@@ -28,10 +28,22 @@ test_acceptance: test_clean # clear the database before each acceptance test run
 
 test_clean:
 	$(DOCKER_COMPOSE) down -t 0
+
 build:
 	docker build --pull --tag quay.io/sharelatex/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) .
 
 publish:
 	docker push quay.io/sharelatex/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 
+ci:
+	# On the CI server, we want to run our tests in the image that we
+	# have built for deployment, which is what the docker-compose.ci.yml
+	# override does.
+	PROJECT_NAME=$(PROJECT_NAME) \
+	BRANCH_NAME=$(BRANCH_NAME) \
+	BUILD_NUMBER=$(BUILD_NUMBER) \
+	DOCKER_COMPOSE_FLAGS="-f docker-compose.ci.yml" \
+	$(MAKE) build test
+
+
 .PHONY: clean test test_unit test_acceptance test_clean build publish
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index 98715c2..16a5da3 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -12,17 +12,10 @@ services:
 
   test_acceptance:
     build: .
-    image: quay.io/sharelatex/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
     extends:
       file: docker-compose-config.yml
       service: ci
-    environment:
-      REDIS_HOST: redis
-      MONGO_HOST: mongo
-    depends_on:
-      - redis
-      - mongo
-    entrypoint: npm run test:acceptance:_run
+    entrypoint: npm run test:acceptance
 
   redis:
     image: redis
diff --git a/docker-compose.yml b/docker-compose.yml
index cf90742..2469482 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,12 +21,6 @@ services:
     extends:
       file: docker-compose-config.yml
       service: dev
-    environment:
-      REDIS_HOST: redis
-      MONGO_HOST: mongo
-    depends_on:
-      - redis
-      - mongo
     entrypoint: npm run test:acceptance
 
   redis: