Merge pull request #18 from STEM-C/develop

Capture student submissions

Author: nionata

README.md

@@ -8,22 +8,16 @@ GitHub actions that enable an automated CI/CD pipeline
 
 ### Build-Test-Deploy
 
-Build a docker image, run the testing harness, push to [GitHub Package Repository](https://github.com/STEM-C/CaSMM/packages) and [Heroku Container Registry](https://devcenter.heroku.com/articles/container-registry-and-runtime), and deploy the image to a target Heroku app
+Build docker images, run the testing harness, push to [GitHub Package Repository](https://github.com/STEM-C/CaSMM/packages) and [Heroku Container Registry](https://devcenter.heroku.com/articles/container-registry-and-runtime), and deploy the image to a target Heroku app
 
 ``` yaml
 inputs:
-  image_name: 
-    description: 'Name of the github package repo image'
-    required: true
   image_tag: 
     description: 'Tag of the github package repo image'
     required: true
   app_name:
     description: 'Target Heroku app name'
     required: true
-  app_type:
-    description: 'Target Heroku app type'
-    required: true
   github_token:
     description: 'Token for github package repo'
     required: true

build-test-deploy/action.yml

@@ -1,27 +1,19 @@
 name: 'Build-Test-Deploy'
 description: 'Build, test, and deploy a target image to heroku'
 inputs:
-  image_name: 
-    description: 'Name of the github package repo image'
-    required: true
   image_tag: 
     description: 'Tag of the github package repo image'
     required: true
   app_name:
     description: 'Target Heroku app name'
     required: true
-  app_type:
-    description: 'Target Heroku app type'
-    required: true
   github_token:
     description: 'Token for github package repo'
     required: true
 runs:
   using: 'docker'
   image: 'Dockerfile'
   args:
-    - ${{ inputs.image_name }}
     - ${{ inputs.image_tag }}
     - ${{ inputs.app_name }}
-    - ${{ inputs.app_type }}
     - ${{ inputs.github_token }}

build-test-deploy/entrypoint.sh

@@ -2,25 +2,35 @@
 
 set -e
 
-if [[ "$#" != 5 ]];
+if [[ "$#" != 3 ]];
 then 
-    echo "Expecting 5 arguments, got $#!"
+    echo "Expecting 3 arguments, got $#!"
     exit 0
 fi;
 
-image_name=$1
-image_tag=$2
-app_name=$3
-app_type=$4
-github_token=$5
+image_tag=$1
+app_name=$2
+github_token=$3
 
-gpr_image_name="docker.pkg.github.com/stem-c/casmm/$image_name"
-heroku_image_name="registry.heroku.com/$app_name/$app_type"
+gpr_base="docker.pkg.github.com/stem-c/casmm"
+heroku_base="registry.heroku.com/$app_name"
 
-# Build and tag image 
+# Log into gpr
 echo "$github_token" | docker login docker.pkg.github.com -u "$GITHUB_ACTOR" --password-stdin
-docker pull "$gpr_image_name" || true
-docker build -t "$gpr_image_name:$image_tag" -t "$gpr_image_name:latest" -t "$heroku_image_name" --cache-from "$gpr_image_name" .
+
+# Name and build server image
+gpr_server="$gpr_base/server"
+heroku_server="$heroku_base/web"
+
+docker pull "$gpr_server" || true
+docker build -t "$gpr_server:$image_tag" -t "$gpr_server:latest" -t "$heroku_server" --cache-from "$gpr_server" .
+
+# Name and build compile image
+gpr_compile="$gpr_base/compile"
+heroku_compile="$heroku_base/compile"
+
+docker pull "$gpr_compile" || true
+docker build -t "$gpr_compile:$image_tag" -t "$gpr_compile:latest" -t "$heroku_compile" --cache-from "$gpr_compile" -f ./compile/Dockerfile ./compile
 
 # Test
 # docker-compose up -d
@@ -33,13 +43,16 @@ docker build -t "$gpr_image_name:$image_tag" -t "$gpr_image_name:latest" -t "$he
 # yarn integration
 # yarn performance
 
-# Push gpr image
-docker push "$gpr_image_name"
+# Push gpr images
+docker push "$gpr_server"
+docker push "$gpr_compile"
 
-# Push heroku image
-# docker login --username=_ --password="$heroku_token" registry.heroku.com
+# Login to heroku container registry
 heroku container:login
-docker push "$heroku_image_name"
+
+# Push heroku image
+docker push "$heroku_server"
+docker push "$heroku_compile"
 
 # Deploy app
-heroku container:release -a "$app_name" web
+heroku container:release -a "$app_name" web compile