running tests, outside containers

Author: gegere

.circleci/config.yml

@@ -3,6 +3,7 @@ jobs:
   build:
     machine: true
     working_directory: ~/apache
+    parallelism: 3
     steps:
       - checkout
 
@@ -12,30 +13,46 @@ jobs:
             echo "Building Docker Image"
             docker build -t htmlgraphic/apache:envoyer .
 
-# WORKS TO HERE
+
+# DEV Build
 
       - run:
-          name: Start Container & Verify
+          name: Start DEV Container
           command: |
             set -x
             ls -la
             pwd
             make run
             docker ps -a
 
-
-
       - run:
-          name: Build Tests
+          name: DEV Build Tests
           command: |
-            bash -c /opt/tests/build_tests.sh
+            docker exec -it apache_web_1 /bin/bash /opt/tests/build_tests.sh
 
       - run: |
           docker logs apache_web_1 > log_output
           mv log_output $CIRCLE_ARTIFACTS/log_output.txt
 
+      - run:
+          name: Kill running containers
+          command: |
+            make stop && make rm
+
+
+# LIVE Build
+
+      - run:
+          name: Start LIVE Container
+          command: |
+            docker-compose up -d
+            docker ps -a
+
+      - run:
+          name: LIVE Build Tests
+          command: |
+            docker exec -it apache_web_1 /bin/bash /opt/tests/build_tests.sh
+
       - run: |
-          docker-compose up -d; sleep 5
-          docker run -d --name apache_web_1 
-          bash -c /opt/tests/build_tests.sh
-          docker ps -a
+          docker logs apache_web_1 > log_output
+          mv log_output $CIRCLE_ARTIFACTS/log_output-LIVE.txt

Makefile

@@ -35,7 +35,7 @@ push:
 	docker push $(IMAGE_NAME):$(VERSION)
 
 run:
-	[ ! -f .env ] && echo '.env2 file does not exist, copy a base env template' && cp .env.example .env || echo "env file exists"
+	[ ! -f .env ] && echo '.env2 file does not exist, copy env template' && cp .env.example .env || echo "env file exists"
 	docker-compose -f docker-compose.local.yml up -d
 
 start: run