Bug Fixes

* Only build the base image at the beginning
* Rename services, use a underscore instead of a dash
* Fix duplicate step names

Author: mlocher

codeship-services.yml

@@ -11,17 +11,17 @@ deployment:
   encrypted_env_file: aws.env.encrypted
   volumes:
     - ./deployment:/deploy
-dockercfg-generator:
+dockercfg_generator:
   build:
     image: codeship/aws-ecr-dockercfg-generator
     path: ./dockercfg-generator
     dockerfile_path: Dockerfile
-dockercfg-test:
+dockercfg_test:
   build:
     image: 870119404647.dkr.ecr.us-east-1.amazonaws.com/codeship-testing
     path: ./dockercfg-generator
     dockerfile_path: Dockerfile.test
-dockercfg-test-generator:
+dockercfg_test_generator:
   image: codeship/aws-ecr-dockercfg-generator
   add_docker: true
   encrypted_env_file: aws.env.encrypted

codeship-steps.yml

@@ -1,19 +1,10 @@
-- name: Build
-  type: parallel
-  steps:
-    - name: AWS Base
-      service: base
-      command: true
-    - name: AWS Deployment
-      service: deployment
-      command: true
-    - name: AWS dockercfg Generator
-      service: dockercfg-generator
-      command: true
+- name: Build Base Image
+  service: base
+  command: true
 - name: Test
   type: serial
   steps:
-    - name: AWS Deployment
+    - name: Test Deployment
       type: serial
       service: deployment
       steps:
@@ -32,23 +23,23 @@
             command: /deploy/test/elastic_beanstalk/integration-test
           - name: Code Deploy
             command: /deploy/test/code_deploy/integration-test
-    - name: AWS dockercfg Generator
-      service: dockercfg-test
+    - name: Test dockercfg Generator
+      service: dockercfg_test
       type: push
       image_name: 870119404647.dkr.ecr.us-east-1.amazonaws.com/codeship-testing
       registry: https://870119404647.dkr.ecr.us-east-1.amazonaws.com
-      dockercfg_service: dockercfg-test-generator
+      dockercfg_service: dockercfg_test_generator
 - name: Deploy (to Docker Hub)
   type: serial
   steps:
-    - name: AWS Deployment
-      service: awsdeployment
+    - name: Push Deployment
+      service: deployment
       tag: master
       type: push
       image_name: codeship/aws-deployment
       encrypted_dockercfg_path: dockercfg.encrypted
-    - name: AWS dockercfg Generator
-      service: dockercfg-generator
+    - name: Push dockercfg Generator
+      service: dockercfg_generator
       tag: master
       type: push
       image_name: codeship/aws-ecr-dockercfg-generator

dockercfg-generator/Dockerfile

@@ -1,7 +1,6 @@
 FROM codeship/aws-base:latest
 MAINTAINER [email protected]
 
-# purposely split this up so layers can download in parallel
 RUN \
   apk --no-cache add \
     bash \