scriptify pr buildspec

Author: cat5inthecradle

ci-build.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+if [ -n "$CODEBUILD_BUILD_ID" ]; then
+    # CodeBuild environment
+    IMAGE_TAG=${CODEBUILD_RESOLVED_SOURCE_VERSION:0:7}
+else
+    # Local Git repository
+    IMAGE_TAG=$(git rev-parse --short HEAD)
+fi
+
+IMAGE_NAME=aiproxy
+
+echo "Building Docker Image ${IMAGE_NAME}:${IMAGE_TAG}..."
+docker build -t ${IMAGE_NAME}:${IMAGE_TAG} .

ci-lint.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+echo "Validating Cloudformation Templates via cfn-lint docker..."
+docker run --rm -i 
+cfn-lint cicd/1-setup/*.template.yml
+cfn-lint cicd/2-cicd/*.template.yml
+cfn-lint cicd/3-app/aiproxy/template.yml
+
+echo "Validating Dockerfile..."
+docker run --rm -i hadolint/hadolint < Dockerfile

cicd/3-app/aiproxy/pr-buildspec.yml

@@ -17,29 +17,15 @@ phases:
       - echo Logging in to Docker Hub...
       - echo $DOCKER_HUB_PAT | docker login -u $DOCKER_HUB_USERNAME --password-stdin
 
-  
   build:
-    # This should be moved to a shell script if it gets more complicated.
     commands:
       - set -e
 
       - BRANCH_NAME=${CODEBUILD_WEBHOOK_HEAD_REF#"refs/heads/"}
       - ARTIFACT_PATH=branch/$BRANCH_NAME/$CODEBUILD_BUILD_NUMBER
+      - COMMIT_HASH=${CODEBUILD_RESOLVED_SOURCE_VERSION:0:7}
 
       - cd $CODEBUILD_SRC_DIR
 
-      - echo "Validating Cloudformation Templates..."
-      - cfn-lint cicd/1-setup/*.template.yml
-      - cfn-lint cicd/2-cicd/*.template.yml
-      - cfn-lint cicd/3-app/aiproxy/template.yml
-
-      - echo "Building Docker Image..."
-      - IMAGE_NAME=aiproxy
-      - IMAGE_TAG=${CODEBUILD_RESOLVED_SOURCE_VERSION:0:7}
-      - docker build -t ${IMAGE_NAME}:${IMAGE_TAG} .
-
-      - echo "Running Unit Tests..."
-      - docker run --rm ${IMAGE_NAME}:${IMAGE_TAG} python -m unittest test_app.py
-
-      - echo "Pushing Docker Image to ECR..."
-      - echo "This is where I would push the docker image to ECR, when I get around to it"
+      - ./ci-lint.sh
+      - ./ci-build.sh