From 4a8e120831c86135cd464329f88957714613be00 Mon Sep 17 00:00:00 2001 From: Raphael Schumacher Date: Tue, 29 Sep 2020 14:58:17 +0000 Subject: [PATCH 01/12] create docker-compose.yml file each time a runtime is deployed --- bin/ci.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/bin/ci.sh b/bin/ci.sh index f84310e..a6b46a2 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -60,6 +60,29 @@ run_test() { return 0 } +activate_runtime() { + runtime=$1 + version=$2 + build=$3 + space=" " + echo "Activating version: $version and runtime: $runtime for build: $build" + if test -f docker-compose.yml; then + echo 'version: "3.8"' > docker-compose.yml + echo "${space}${space}services:" >> docker-compose.yml + echo "Appending runtime to docker-compose.yml..." + echo "${space}${space}$runtime-$version:" >> docker-compose.yml + echo "${space}${space}${space}${space}image: $CPHP_REGISTRY_ADDRESS/$runtime:$version" >> docker-compose.yml + else + echo "Creating docker-compose.yml..." + echo "Appending runtime to docker-compose.yml..." + echo "${space}${space}$runtime-$version:" >> docker-compose.yml + echo "${space}${space}${space}${space}image: $CPHP_REGISTRY_ADDRESS/$runtime:$version" >> docker-compose.yml fi + fi + cat docker-compose.yml + #aws --profile runtime-containers-builder s3 cp docker-compose.yml "$BUILT_RUNTIMES_S3/docker-compose.yml" + return 0 +} + run_deploy() { runtime=$1 version=$2 @@ -67,6 +90,7 @@ run_deploy() { exec_builder "docker tag continuous:php_$version 310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" exec_builder "aws ecr get-login --region us-east-1 --registry-ids 310957825501 --no-include-email | bash" exec_builder "docker push 310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" + activate_runtime $runtime $version $CPHP_BUILD_ID } action=$1 From 4baa42d9f8b8be37939a60d53135c769ebe322c7 Mon Sep 17 00:00:00 2001 From: Raphael Schumacher Date: Tue, 29 Sep 2020 15:04:22 +0000 Subject: [PATCH 02/12] remove useless arg --- bin/ci.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/ci.sh b/bin/ci.sh index a6b46a2..2a89fdd 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -63,7 +63,6 @@ run_test() { activate_runtime() { runtime=$1 version=$2 - build=$3 space=" " echo "Activating version: $version and runtime: $runtime for build: $build" if test -f docker-compose.yml; then @@ -90,7 +89,7 @@ run_deploy() { exec_builder "docker tag continuous:php_$version 310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" exec_builder "aws ecr get-login --region us-east-1 --registry-ids 310957825501 --no-include-email | bash" exec_builder "docker push 310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" - activate_runtime $runtime $version $CPHP_BUILD_ID + activate_runtime $runtime $version } action=$1 From 061119477520b092d3feff1456c588dfdfe29714 Mon Sep 17 00:00:00 2001 From: Raphael Schumacher Date: Tue, 29 Sep 2020 15:43:21 +0000 Subject: [PATCH 03/12] fix ci script --- bin/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ci.sh b/bin/ci.sh index 2a89fdd..9431984 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -64,7 +64,7 @@ activate_runtime() { runtime=$1 version=$2 space=" " - echo "Activating version: $version and runtime: $runtime for build: $build" + echo "Activating runtime: $runtime on version: $version" if test -f docker-compose.yml; then echo 'version: "3.8"' > docker-compose.yml echo "${space}${space}services:" >> docker-compose.yml From 75c01ec6ab47e238464d9e59751a15d2114f996c Mon Sep 17 00:00:00 2001 From: Raphael Schumacher Date: Tue, 29 Sep 2020 15:53:03 +0000 Subject: [PATCH 04/12] fix ci --- bin/ci.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/ci.sh b/bin/ci.sh index 9431984..f27b315 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -64,18 +64,19 @@ activate_runtime() { runtime=$1 version=$2 space=" " + file=docker-compose.yml echo "Activating runtime: $runtime on version: $version" - if test -f docker-compose.yml; then + if [[ -f $file ]]; then echo 'version: "3.8"' > docker-compose.yml echo "${space}${space}services:" >> docker-compose.yml echo "Appending runtime to docker-compose.yml..." echo "${space}${space}$runtime-$version:" >> docker-compose.yml - echo "${space}${space}${space}${space}image: $CPHP_REGISTRY_ADDRESS/$runtime:$version" >> docker-compose.yml + echo "${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" >> docker-compose.yml else echo "Creating docker-compose.yml..." echo "Appending runtime to docker-compose.yml..." echo "${space}${space}$runtime-$version:" >> docker-compose.yml - echo "${space}${space}${space}${space}image: $CPHP_REGISTRY_ADDRESS/$runtime:$version" >> docker-compose.yml fi + echo "${space}${space}${space}${space}image: 310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" >> docker-compose.yml fi fi cat docker-compose.yml #aws --profile runtime-containers-builder s3 cp docker-compose.yml "$BUILT_RUNTIMES_S3/docker-compose.yml" @@ -89,7 +90,6 @@ run_deploy() { exec_builder "docker tag continuous:php_$version 310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" exec_builder "aws ecr get-login --region us-east-1 --registry-ids 310957825501 --no-include-email | bash" exec_builder "docker push 310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" - activate_runtime $runtime $version } action=$1 From fd67fedaf89302889dc65434e1dba455eb59ff74 Mon Sep 17 00:00:00 2001 From: Raphael Schumacher Date: Tue, 29 Sep 2020 15:58:16 +0000 Subject: [PATCH 05/12] make things runnable --- bin/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ci.sh b/bin/ci.sh index f27b315..2dc4558 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -60,7 +60,7 @@ run_test() { return 0 } -activate_runtime() { +run_activate_runtime() { runtime=$1 version=$2 space=" " From 29e60cf29cf420efb015adaf9886b444297a9410 Mon Sep 17 00:00:00 2001 From: Raphael Schumacher Date: Tue, 29 Sep 2020 16:37:25 +0000 Subject: [PATCH 06/12] oneliner check for ssh exec --- bin/ci.sh | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/bin/ci.sh b/bin/ci.sh index 2dc4558..3a4192d 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -66,19 +66,8 @@ run_activate_runtime() { space=" " file=docker-compose.yml echo "Activating runtime: $runtime on version: $version" - if [[ -f $file ]]; then - echo 'version: "3.8"' > docker-compose.yml - echo "${space}${space}services:" >> docker-compose.yml - echo "Appending runtime to docker-compose.yml..." - echo "${space}${space}$runtime-$version:" >> docker-compose.yml - echo "${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" >> docker-compose.yml - else - echo "Creating docker-compose.yml..." - echo "Appending runtime to docker-compose.yml..." - echo "${space}${space}$runtime-$version:" >> docker-compose.yml - echo "${space}${space}${space}${space}image: 310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" >> docker-compose.yml fi - fi - cat docker-compose.yml + exec_builder "-f $file && echo 'version: "3.8"' > docker-compose.yml; echo "$space$spaceservices:" >> docker-compose.yml; echo "Appending runtime to docker-compose.yml..."; echo "${space}${space}$runtime-$version:" >> docker-compose.yml ; echo "${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" >> docker-compose.yml || echo "${space}${space}$runtime-$version:" >> docker-compose.yml ; echo "${space}${space}${space}${space}image: 310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" >> docker-compose.yml || return 1" + exec_builder 'cat docker-compose.yml' #aws --profile runtime-containers-builder s3 cp docker-compose.yml "$BUILT_RUNTIMES_S3/docker-compose.yml" return 0 } From 3c009cdd4dc87c3d93de19f04521fc84efbb732a Mon Sep 17 00:00:00 2001 From: Raphael Schumacher Date: Tue, 29 Sep 2020 16:46:40 +0000 Subject: [PATCH 07/12] add mapping for activate_runtime in ci --- bin/ci.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bin/ci.sh b/bin/ci.sh index 3a4192d..90db1a4 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -115,6 +115,12 @@ then exit 0 fi +if [ "activate_runtime" == "$action" ]; +then + run_activate_runtime $runtime $version + exit 0 +fi + if [ "copy_build_package" == "$action" ]; then run_copy_build_package From 829afdae12db63882d6b2ed1f6373e5adcf9b290 Mon Sep 17 00:00:00 2001 From: Raphael Schumacher Date: Tue, 29 Sep 2020 16:56:27 +0000 Subject: [PATCH 08/12] remove double quotes --- bin/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ci.sh b/bin/ci.sh index 90db1a4..7a5d5ad 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -66,7 +66,7 @@ run_activate_runtime() { space=" " file=docker-compose.yml echo "Activating runtime: $runtime on version: $version" - exec_builder "-f $file && echo 'version: "3.8"' > docker-compose.yml; echo "$space$spaceservices:" >> docker-compose.yml; echo "Appending runtime to docker-compose.yml..."; echo "${space}${space}$runtime-$version:" >> docker-compose.yml ; echo "${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" >> docker-compose.yml || echo "${space}${space}$runtime-$version:" >> docker-compose.yml ; echo "${space}${space}${space}${space}image: 310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version" >> docker-compose.yml || return 1" + exec_builder "-f $file && echo version: \"3.8\" > docker-compose.yml; echo $space$spaceservices: >> docker-compose.yml; echo 'Appending runtime to docker-compose.yml...'; echo ${space}${space}$runtime-$version: >> docker-compose.yml ; echo ${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version >> docker-compose.yml || echo ${space}${space}$runtime-$version: >> docker-compose.yml ; echo ${space}${space}${space}${space}image: 310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version >> docker-compose.yml || return 1" exec_builder 'cat docker-compose.yml' #aws --profile runtime-containers-builder s3 cp docker-compose.yml "$BUILT_RUNTIMES_S3/docker-compose.yml" return 0 From eca57a84cfb80c7071ea2b43294a80ffbad1a684 Mon Sep 17 00:00:00 2001 From: Raphael Schumacher Date: Tue, 29 Sep 2020 19:00:09 +0000 Subject: [PATCH 09/12] better command build for ssh exec --- bin/ci.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/ci.sh b/bin/ci.sh index 7a5d5ad..01ab2d9 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -66,8 +66,13 @@ run_activate_runtime() { space=" " file=docker-compose.yml echo "Activating runtime: $runtime on version: $version" - exec_builder "-f $file && echo version: \"3.8\" > docker-compose.yml; echo $space$spaceservices: >> docker-compose.yml; echo 'Appending runtime to docker-compose.yml...'; echo ${space}${space}$runtime-$version: >> docker-compose.yml ; echo ${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version >> docker-compose.yml || echo ${space}${space}$runtime-$version: >> docker-compose.yml ; echo ${space}${space}${space}${space}image: 310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/$runtime:$version >> docker-compose.yml || return 1" - exec_builder 'cat docker-compose.yml' + exec_builder "-f docker-compose.yml" + if [[$?]]; then + command="echo -e version: \"3.8\"\n${space}${space}services:\n${space}${space}${space}${space}${runtime}-${version}\n${space}${space}${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/${runtime}:${version} >> docker-compose.yml" + else + command="echo -e ${space}${space}${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/${runtime}:${version} >> docker-compose.yml" + fi + exec_builder "$command" || return 1 #aws --profile runtime-containers-builder s3 cp docker-compose.yml "$BUILT_RUNTIMES_S3/docker-compose.yml" return 0 } From 564deea9912b410ed40eb9acf22b4fc93c7696ee Mon Sep 17 00:00:00 2001 From: Raphael Schumacher Date: Tue, 29 Sep 2020 19:01:12 +0000 Subject: [PATCH 10/12] fix typo --- bin/ci.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ci.sh b/bin/ci.sh index 01ab2d9..d1b3929 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -66,7 +66,7 @@ run_activate_runtime() { space=" " file=docker-compose.yml echo "Activating runtime: $runtime on version: $version" - exec_builder "-f docker-compose.yml" + exec_builder "test -f docker-compose.yml" if [[$?]]; then command="echo -e version: \"3.8\"\n${space}${space}services:\n${space}${space}${space}${space}${runtime}-${version}\n${space}${space}${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/${runtime}:${version} >> docker-compose.yml" else From e00857415d4a91ba5e9d9ab4ee3d6f18a7aecff2 Mon Sep 17 00:00:00 2001 From: Raphael Schumacher Date: Tue, 29 Sep 2020 19:06:48 +0000 Subject: [PATCH 11/12] fix bad check --- bin/ci.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/ci.sh b/bin/ci.sh index d1b3929..565b40c 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -66,12 +66,10 @@ run_activate_runtime() { space=" " file=docker-compose.yml echo "Activating runtime: $runtime on version: $version" - exec_builder "test -f docker-compose.yml" - if [[$?]]; then - command="echo -e version: \"3.8\"\n${space}${space}services:\n${space}${space}${space}${space}${runtime}-${version}\n${space}${space}${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/${runtime}:${version} >> docker-compose.yml" - else - command="echo -e ${space}${space}${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/${runtime}:${version} >> docker-compose.yml" - fi + + exec_builder "test -f docker-compose.yml" && \ + command="echo -e version: \"3.8\"\n${space}${space}services:\n${space}${space}${space}${space}${runtime}-${version}\n${space}${space}${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/${runtime}:${version} >> docker-compose.yml" || \ + command="echo -e ${space}${space}${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/${runtime}:${version} >> docker-compose.yml" exec_builder "$command" || return 1 #aws --profile runtime-containers-builder s3 cp docker-compose.yml "$BUILT_RUNTIMES_S3/docker-compose.yml" return 0 From 1fb633c8190d7cf9c54e95a761a42798ecb36732 Mon Sep 17 00:00:00 2001 From: Raphael Schumacher Date: Tue, 29 Sep 2020 19:12:41 +0000 Subject: [PATCH 12/12] debug log --- bin/ci.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/ci.sh b/bin/ci.sh index 565b40c..1c2dfcc 100755 --- a/bin/ci.sh +++ b/bin/ci.sh @@ -71,6 +71,7 @@ run_activate_runtime() { command="echo -e version: \"3.8\"\n${space}${space}services:\n${space}${space}${space}${space}${runtime}-${version}\n${space}${space}${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/${runtime}:${version} >> docker-compose.yml" || \ command="echo -e ${space}${space}${space}${space}${space}${space}image:310957825501.dkr.ecr.us-east-1.amazonaws.com/cphp/runtime/${runtime}:${version} >> docker-compose.yml" exec_builder "$command" || return 1 + exec_builder "cat docker-compose.yml" || return 1 #aws --profile runtime-containers-builder s3 cp docker-compose.yml "$BUILT_RUNTIMES_S3/docker-compose.yml" return 0 }