Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: veezor/maestro
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d6788635a821a442a8bd70671d12d81fddd052c4
Choose a base ref
..
head repository: veezor/maestro
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1181d51387b1b56449165d0308ab81c56d284578
Choose a head ref
Showing with 8 additions and 6 deletions.
  1. +0 −1 build.sh
  2. +1 −1 deploy.sh
  3. +0 −1 main.sh
  4. +0 −1 provision.sh
  5. +7 −2 render.sh
1 change: 0 additions & 1 deletion build.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash

set -x
set -eo pipefail

VALID_ARGS=$(getopt -o i: --long image-name: -n 'build.sh' -- "$@")
2 changes: 1 addition & 1 deletion deploy.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -x

set -eo pipefail

VALID_ARGS=$(getopt -o a:ci:p:r:s: --long account-id:,create-service,cluster-id:,process-type:,repository-slug:,service-name: -n 'deploy.sh' -- "$@")
1 change: 0 additions & 1 deletion main.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash

set -x
set -eo pipefail

if [ -z "$REPO_SLUG" ]; then
1 change: 0 additions & 1 deletion provision.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash

set -x
set -eo pipefail

VALID_ARGS=$(getopt -o b:p:r: --long branch-name:,process-type:,repository-slug: -n 'provision.sh' -- "$@")
9 changes: 7 additions & 2 deletions render.sh
View file
Original file line number Diff line number Diff line change
@@ -161,8 +161,13 @@ if [ ! -z "$render_family_name" ]; then
echo "----> Filling family with $render_family_name"
cat <<< $(jq ".family=\"$render_family_name\"" $render_task_definition) > $render_task_definition

echo "----> Filling container's AWS logs information"
cat <<< $(jq ".containerDefinitions[]=(.containerDefinitions[] | select(.name==\"$render_container_name\") | . + {logConfiguration: {logDriver: \"awslogs\", options: {\"awslogs-group\": \"/ecs/$render_family_name\", \"awslogs-region\": \"$AWS_REGION\", \"awslogs-stream-prefix\": \"ecs\"}}})" $render_task_definition) > $render_task_definition
if [[ ! -z $MAESTRO_NO_LOG && $MAESTRO_NO_LOG = "true" ]]; then
echo "----> Skipping log creation"
cat <<< $(jq ".containerDefinitions[]=(.containerDefinitions[] | select(.name==\"$render_container_name\") | del(.logConfiguration))" $render_task_definition) > $render_task_definition
else
echo "----> Filling container's AWS logs information"
cat <<< $(jq ".containerDefinitions[]=(.containerDefinitions[] | select(.name==\"$render_container_name\") | . + {logConfiguration: {logDriver: \"awslogs\", options: {\"awslogs-group\": \"/ecs/$render_family_name\", \"awslogs-region\": \"$AWS_REGION\", \"awslogs-stream-prefix\": \"ecs\"}}})" $render_task_definition) > $render_task_definition
fi
fi

if [ ! -z "$render_aws_sm_name" ]; then