Merge branch 'develop' into chore/bump_wrappers

Author: darora

common.vars.pkr.hcl

@@ -1 +1 @@
-postgres-version = "15.1.0.145"
+postgres-version = "15.1.0.147"

docker/all-in-one/Dockerfile

@@ -3,7 +3,7 @@ ARG postgres_version=15.1.0.83
 ARG pgbouncer_release=1.18.0
 ARG postgrest_release=10.1.2
 ARG gotrue_release=2.47.0
-ARG adminapi_release=0.48.0
+ARG adminapi_release=0.57.1
 ARG adminmgr_release=0.9.0
 ARG vector_release=0.22.3
 ARG postgres_exporter_release=0.9.0

docker/all-in-one/init/configure-envoy.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 set -eou pipefail
 
+if [ "${ENVOY_ENABLED:-}" != "true" ]; then
+  exit
+fi
+
 ENVOY_CDS_CONF=/etc/envoy/cds.yaml
 ENVOY_LDS_CONF=/etc/envoy/lds.yaml
 touch /var/log/services/envoy.log
@@ -25,8 +29,8 @@ fi
 
 if [ -f "${INIT_PAYLOAD_PATH:-}" ]; then
   echo "init envoy payload"
-  tar -xzvf "$INIT_PAYLOAD_PATH" -C / ./etc/envoy/
-  chown -R adminapi:adminapi /etc/envoy
+  tar -xzvhf "$INIT_PAYLOAD_PATH" -C / ./etc/envoy/
+  chown -HR adminapi:adminapi /etc/envoy
 fi
 
 # Inject project specific configuration