reducing steps, creating tests to more closely match local dev steps

Author: gegere

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     machine: true
-    working_directory: ~/apache
+    working_directory: ~/logs
 
     steps:
       - checkout
@@ -16,7 +16,7 @@ jobs:
       - run:
           name: Build Apache Docker image
           command: |
-            docker build -t htmlgraphic/apache:envoyer .
+            make build
 
 
 # DEV Build
@@ -31,22 +31,22 @@ jobs:
             docker ps -a
             sleep 10
 
-      - run: mkdir -p ~/apache/logs/container-build
+      - run: mkdir -p ~/logs/container-build
 
       - run:
           name: Container Logs
           command: |
-            docker logs apache_web_1 > ~/apache/logs/container-build/log_output-DEV.txt
+            docker logs apache > ~/logs/container-build/log_output-DEV.txt
 
       - run:
           name: Global Environment Vars
           command: |
-            docker exec apache_web_1 /bin/bash -c "export"
+            docker exec apache /bin/bash -c "export"
 
       - run:
           name: DEV Build Tests
           command: |
-            docker exec apache_web_1 /bin/bash /opt/tests/build_tests.sh
+            docker exec apache /bin/bash /opt/tests/build_tests.sh
 
 
       - run:
@@ -72,14 +72,14 @@ jobs:
       - run:
           name: Container Logs
           command: |
-            docker logs apache_hg-web_1 > ~/apache/logs/container-build/log_output-LIVE.txt
+            docker logs apache_hg-web_1 > ~/logs/container-build/log_output-LIVE.txt
 
 
 
       - store_artifacts:
-          path: ~/apache/logs/container-build
+          path: ~/logs/container-build
           destination: raw-test-output
 
       - store_test_results:
-          path: ~/apache/logs/container-build
+          path: ~/logs/container-build
 

docker-compose.local.yml

@@ -2,6 +2,7 @@ version: "3"
 services:
   web:
     image: 'htmlgraphic/apache:envoyer'
+    container_name: apache
     volumes:
       - "/Volumes/Case/SITES/docker:/data" # <- Change to preferred local working dir
      #- "/c/Users/southpark/docker:/data"

shippable.yml

@@ -9,21 +9,18 @@ env:
 
 build:
   pre_ci:
-    - docker build --no-cache -t htmlgraphic/apache:$BRANCH .
-    #- sudo apt-get update && apt-get -y install python-pip
-    #- sudo pip install -U docker-compose
+    - make build
   pre_ci_boot:
     image_name: htmlgraphic/apache
     image_tag: $BRANCH
     pull: false
   ci:
     - "bash app/run.sh &"
-    - sleep 5
     - "/usr/sbin/postconf -n"
     - sleep 5
     - "bash tests/build_tests.sh"
   on_failure:
-    - docker logs apache_web_1
+    - docker logs apache
   # on_success:
   #   - docker push htmlgraphic/apache:$BRANCH