Skip to content

Commit a058bb3

Browse files
committed
Merge branch 'tf-dle-3-2-0' into 'master'
Use DLE 3.2.0 See merge request postgres-ai/terraform-postgres-ai-database-lab!56
2 parents acd6267 + d566e8f commit a058bb3

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

Diff for: dle-logical-init.sh.tpl

+8-6
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,12 @@ postgres_conf_path="/home/ubuntu/.dblab/postgres_conf"
121121
mkdir -p $dle_config_path
122122
mkdir -p $dle_meta_path
123123
mkdir -p $postgres_conf_path
124+
mkdir -p $dle_logs_path
124125

125-
curl https://gitlab.com/postgres-ai/database-lab/-/raw/${dle_version}/configs/config.example.logical_generic.yml --output $dle_config_path/server.yml
126-
curl https://gitlab.com/postgres-ai/database-lab/-/raw/${dle_version}/configs/standard/postgres/control/pg_hba.conf \
126+
curl https://gitlab.com/postgres-ai/database-lab/-/raw/${dle_version}/engine/configs/config.example.logical_generic.yml --output $dle_config_path/server.yml
127+
curl https://gitlab.com/postgres-ai/database-lab/-/raw/${dle_version}/engine/configs/standard/postgres/control/pg_hba.conf \
127128
--output $postgres_conf_path/pg_hba.conf
128-
curl https://gitlab.com/postgres-ai/database-lab/-/raw/${dle_version}/configs/standard/postgres/control/postgresql.conf --output $postgres_conf_path/postgresql.conf
129+
curl https://gitlab.com/postgres-ai/database-lab/-/raw/${dle_version}/engine/configs/standard/postgres/control/postgresql.conf --output $postgres_conf_path/postgresql.conf
129130
cat /tmp/postgresql_clones_custom.conf >> $postgres_conf_path/postgresql.conf
130131

131132
yq e -i '
@@ -202,8 +203,9 @@ sudo docker run \
202203
--publish 2345:2345 \
203204
--volume /var/run/docker.sock:/var/run/docker.sock \
204205
--volume /var/lib/dblab:/var/lib/dblab/:rshared \
205-
--volume $dle_config_path:/home/dblab/configs:ro \
206+
--volume $dle_config_path:/home/dblab/configs \
206207
--volume $dle_meta_path:/home/dblab/meta \
208+
--volume $dle_logs_path:/home/dblab/logs \
207209
--volume $postgres_conf_path:/home/dblab/standard/postgres/control \
208210
$extra_mount \
209211
--env DOCKER_API_VERSION=1.39 \
@@ -217,7 +219,7 @@ for i in {1..30000}; do
217219
sleep 10
218220
done
219221

220-
curl https://gitlab.com/postgres-ai/database-lab/-/raw/${dle_version}/scripts/cli_install.sh | bash
222+
curl https://gitlab.com/postgres-ai/database-lab/-/raw/${dle_version}/engine/scripts/cli_install.sh | bash
221223
sudo mv ~/.dblab/dblab /usr/local/bin/dblab
222224

223225
# Init dblab environment
@@ -263,7 +265,7 @@ sudo docker run \
263265
ci_checker_config_path="/home/ubuntu/.dblab/ci_checker/configs"
264266
mkdir -p $ci_checker_config_path
265267

266-
curl https://gitlab.com/postgres-ai/database-lab/-/raw/${dle_version}/configs/config.example.ci_checker.yml --output $ci_checker_config_path/ci_checker.yml
268+
curl https://gitlab.com/postgres-ai/database-lab/-/raw/${dle_version}/engine/configs/config.example.ci_checker.yml --output $ci_checker_config_path/ci_checker.yml
267269

268270
yq e -i '
269271
.app.debug = ${dle_debug_mode} |

Diff for: terraform.tfvars

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dle_version = "v3.0.1" # it is also possible to use branch name here (e.g., "master")
1+
dle_version = "v3.2.0" # it is also possible to use branch name here (e.g., "master")
22
joe_version = "0.10.0"
33

44
aws_ami_name = "DBLABserver*"

0 commit comments

Comments
 (0)