Support app_directory

README.md

@@ -74,6 +74,7 @@ The following inputs can be used as `step.with` keys
 | `ec2_instance_profile` | String | The AWS IAM instance profile to use for the EC2 instance. Default is `${GITHUB_ORG_NAME}-${GITHUB_REPO_NAME}-${GITHUB_BRANCH_NAME}` |
 | `stack_destroy` | String | Set to `true` to destroy the stack. Default is `""` |
 | `aws_resource_identifier` | String | Set to override the AWS resource identifier for the deployment.  Defaults to `${org}-{repo}-{branch}`.  Use with destroy to destroy specific resources. |
+| `app_directory` | String | Relative path for the directory of the app (i.e. where `Dockerfile` and `docker-compose.yaml` files are located). This is the directory that is copied to the EC2 instance.  Default is the root of the repo. |
 
 ## Made with BitOps
 [BitOps](https://bitops.sh) allows you to define Infrastructure-as-Code for multiple tools in a central place.  This action uses a BitOps [Operations Repository](https://bitops.sh/operations-repo-structure/) to set up the necessary Terraform and Ansible to create infrastructure and deploy to it.

action.yaml

@@ -42,6 +42,8 @@ inputs:
     required: true
   sub_domain:
     description: 'Define the sub-domain part of the URL. Defaults to `${org}-${repo}-{branch}`'
+  app_directory:
+    description: 'Relative path for the directory of the app (i.e. where `Dockerfile` and `docker-compose.yaml` files are located). This is the directory that is copied to the EC2 instance.  Default is the root of the repo.'
 outputs:
   vm_url:
     description: "The URL of the generated app"
@@ -72,6 +74,7 @@ runs:
         DOMAIN_NAME: ${{ inputs.domain_name }}
         SUB_DOMAIN: ${{ inputs.sub_domain }}
         BITOPS_FAST_FAIL: true
+        APP_DIRECTORY: ${{ inputs.app_directory }}
       run: |
         echo "running operations/_scripts/deploy/deploy.sh"
         $GITHUB_ACTION_PATH/operations/_scripts/deploy/deploy.sh

operations/_scripts/generate/generate_app_repo.sh

@@ -8,4 +8,11 @@ GITHUB_REPO_NAME=$(echo $GITHUB_REPOSITORY | sed 's/^.*\///')
 
 echo "Copying files from GITHUB_WORKSPACE ($GITHUB_WORKSPACE) to ops repo's Ansible deployment (${GITHUB_ACTION_PATH}/operations/deployment/ansible/app/${GITHUB_REPO_NAME})"
 mkdir -p "${GITHUB_ACTION_PATH}/operations/deployment/ansible/app/${GITHUB_REPO_NAME}"
-cp -rf "$GITHUB_WORKSPACE"/* "${GITHUB_ACTION_PATH}/operations/deployment/ansible/app/${GITHUB_REPO_NAME}/"
+
+TARGET_PATH="$GITHUB_WORKSPACE"
+if [ -n "$APP_DIRECTORY" ]; then
+    echo "APP_DIRECTORY: $APP_DIRECTORY"
+    TARGET_PATH="${TARGET_PATH}/${APP_DIRECTORY}"
+fi
+
+cp -rf "$TARGET_PATH"/* "${GITHUB_ACTION_PATH}/operations/deployment/ansible/app/${GITHUB_REPO_NAME}/"

operations/deployment/terraform/bitops.before-deploy.d/create-tf-state-bucket.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-echo ""
+echo "Creating TF_STATE_BUCKET: $TF_STATE_BUCKET"
 if [ "$AWS_DEFAULT_REGION" == "us-east-1" ]; then
   aws s3api create-bucket --bucket $TF_STATE_BUCKET --region $AWS_DEFAULT_REGION || true
 else