Commit c024b8f

committed

Merge branch 'cf_320_update_after_aws_review' into 'master'

moved wget from CF to AMI See merge request postgres-ai/database-lab!635

2 parents 2db6723 + de6f8ee commit c024b8fCopy full SHA for c024b8f

File tree

3 files changed

+25

-25

lines changed

cloudformation
- dle_cf_template.yaml
- getAMIs.sh
packer
- install-prereqs.sh

3 files changed

+25

-25

lines changed

`‎cloudformation/dle_cf_template.yaml‎`

Lines changed: 18 additions & 23 deletions

Original file line number	Diff line number	Diff line change
`@@ -160,39 +160,39 @@ Mappings:`
`160`	`160`	`Arch: HVM64`
`161`	`161`	`AWSRegionArch2AMI:`
`162`	`162`	`eu-north-1:`
`163`		`- HVM64: ami-0888261a1eacb636e`
	`163`	`+ HVM64: ami-09d9e079b37b2cb70`
`164`	`164`	`ap-south-1:`
`165`		`- HVM64: ami-00539bfa7a6926e1b`
	`165`	`+ HVM64: ami-02724fdeb697971fe`
`166`	`166`	`eu-west-3:`
`167`		`- HVM64: ami-038d1f1d1ef71112b`
	`167`	`+ HVM64: ami-05d0e3243114ebecd`
`168`	`168`	`eu-west-2:`
`169`		`- HVM64: ami-07c2bca027887871b`
	`169`	`+ HVM64: ami-04e33af41123d6dda`
`170`	`170`	`eu-west-1:`
`171`		`- HVM64: ami-0e38f0f4f0acd49c2`
	`171`	`+ HVM64: ami-066433aacb63c1599`
`172`	`172`	`ap-northeast-3:`
`173`		`- HVM64: ami-01cd2976ef1688c25`
	`173`	`+ HVM64: ami-0a21dfc175a1e7ca6`
`174`	`174`	`ap-northeast-2:`
`175`		`- HVM64: ami-049c608703690f99e`
	`175`	`+ HVM64: ami-0ae0dd482bbe35b52`
`176`	`176`	`ap-northeast-1:`
`177`		`- HVM64: ami-0cb59515cd67fdc93`
	`177`	`+ HVM64: ami-0627be691f1d37e46`
`178`	`178`	`sa-east-1:`
`179`		`- HVM64: ami-0b3aeaa58412025de`
	`179`	`+ HVM64: ami-006f02a26fe6d6dab`
`180`	`180`	`ca-central-1:`
`181`		`- HVM64: ami-075d0aae6fdd356b1`
	`181`	`+ HVM64: ami-0b6b8f39051e16607`
`182`	`182`	`ap-southeast-1:`
`183`		`- HVM64: ami-054e735ba76985f92`
	`183`	`+ HVM64: ami-08af0daa0cad9e22c`
`184`	`184`	`ap-southeast-2:`
`185`		`- HVM64: ami-06558ef4fedcf3c2f`
	`185`	`+ HVM64: ami-0f9db3c26e6c72bf5`
`186`	`186`	`eu-central-1:`
`187`		`- HVM64: ami-048a27a74e4c1239d`
	`187`	`+ HVM64: ami-02af16e4c00db42d3`
`188`	`188`	`us-east-1:`
`189`		`- HVM64: ami-0ed40b8023c788775`
	`189`	`+ HVM64: ami-0a30cae8ab4ebfaab`
`190`	`190`	`us-east-2:`
`191`		`- HVM64: ami-0d6a0bd053962b66f`
	`191`	`+ HVM64: ami-03c6dd9057f62145e`
`192`	`192`	`us-west-1:`
`193`		`- HVM64: ami-0ef7453c037b624ec`
	`193`	`+ HVM64: ami-044089283cd0a74f8`
`194`	`194`	`us-west-2:`
`195`		`- HVM64: ami-0bdf048f8e10f02eb`
	`195`	`+ HVM64: ami-0df17c09c98bbed09`
`196`	`196`	`Conditions:`
`197`	`197`	`CreateSubDomain:`
`198`	`198`	`!Not [!Equals [!Ref CertificateHostedZone, '']]`
`@@ -318,7 +318,7 @@ Resources:`
`318`	`318`
`319`	`319`	`yq e -i '`
`320`	`320`	`.embeddedUI.host="" \|`
`321`		`- .embeddedUI.dockerImage="registry.gitlab.com/postgres-ai/database-lab/ce-ui:$DLE_DOCKER_IMAGE_VERSION" \|`
	`321`	`+ .embeddedUI.dockerImage="postgresai/ce-ui:$DLE_DOCKER_IMAGE_VERSION" \|`
`322`	`322`	`.server.verificationToken="${DLEVerificationToken}" \|`
`323`	`323`	`.poolManager.mountDir = "/var/lib/dblab/dblab_pool" \|`
`324`	`324`	`.retrieval.spec.logicalDump.options.dumpLocation="/var/lib/dblab/dblab_pool/dataset_1/dump/" \|`
`@@ -375,11 +375,6 @@ Resources:`
`375`	`375`	`sudo systemctl start envoy`
`376`	`376`	`fi`
`377`	`377`
`378`		`- # upgrade ssm agent version`
`379`		`- wget https://s3.us-east-1.amazonaws.com/amazon-ssm-us-east-1/amazon-ssm-agent/3.1.1575.0/amazon-ssm-agent-ubuntu-amd64.tar.gz`
`380`		`- tar -xf amazon-ssm-agent-ubuntu-amd64.tar.gz`
`381`		`- bash snap-install.sh`
`382`		`-`
`383`	`378`	`# Initialize CLI configuration`
`384`	`379`	`su ubuntu -c '/usr/local/bin/dblab init \`
`385`	`380`	`--environment-id=test \`

`‎cloudformation/getAMIs.sh‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ NOAMI="NOT_SUPPORTED"`
`17`	`17`	`# Change your aws profile if needed here (example, " --profile default"):`
`18`	`18`	`PROFILE=${DLE_AWS_PROFILE:-""}`
`19`	`19`
`20`		`-DLE_CF_TEMPLATE_FILE="${DLE_CF_TEMPLATE_FILE:-dle_cf.yaml}"`
	`20`	`+DLE_CF_TEMPLATE_FILE="${DLE_CF_TEMPLATE_FILE:-dle_cf_template.yaml}"`
`21`	`21`
`22`	`22`	`# Check whether AWS CLI is installed and in search path`
`23`	`23`	`if ! aws_loc="$(type -p "aws")" \|\| [ -z "$aws_loc" ]; then`

`‎packer/install-prereqs.sh‎`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,15 @@ sudo /usr/local/bin/func-e use 1.19.1 # https://www.envoyproxy.io/docs/envoy/lat`
`57`	`57`	`# Pull DLE image`
`58`	`58`	`image_version=$(echo ${dle_version} \| sed 's/v*//')`
`59`	`59`	`sudo docker pull registry.gitlab.com/postgres-ai/database-lab/dblab-server:$image_version`
`60`		`-sudo docker pull postgresai/ce-ui:latest`
	`60`	`+sudo docker pull postgresai/ce-ui:1.1.0`
`61`	`61`	`sudo docker pull postgresai/extended-postgres:10`
`62`	`62`	`sudo docker pull postgresai/extended-postgres:11`
`63`	`63`	`sudo docker pull postgresai/extended-postgres:12`
`64`	`64`	`sudo docker pull postgresai/extended-postgres:13`
`65`	`65`	`sudo docker pull postgresai/extended-postgres:14`
`66`	`66`
	`67`	`+# upgrade ssm agent version`
	`68`	`+wget https://s3.us-east-1.amazonaws.com/amazon-ssm-us-east-1/amazon-ssm-agent/3.1.1575.0/amazon-ssm-agent-ubuntu-amd64.tar.gz`
	`69`	`+tar -xf amazon-ssm-agent-ubuntu-amd64.tar.gz`
	`70`	`+sudo bash snap-install.sh`
	`71`	`+`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit c024b8f

File tree

3 files changed

3 files changed

`‎cloudformation/dle_cf_template.yaml‎`

`‎cloudformation/getAMIs.sh‎`

`‎packer/install-prereqs.sh‎`

0 commit comments