Merge branch 'develop' into pcnc/fix-binary-collection

Author: pcnc

Dockerfile

@@ -30,7 +30,7 @@ ARG pg_jsonschema_release=0.1.4
 ARG vault_release=0.2.8
 ARG groonga_release=12.0.8
 ARG pgroonga_release=2.4.0
-ARG wrappers_release=0.1.11
+ARG wrappers_release=0.1.14
 ARG hypopg_release=1.3.1
 ARG pg_repack_release=1.4.8
 ARG pgvector_release=0.4.0

ansible/vars.yml

@@ -105,7 +105,7 @@ libsodium_release_checksum: sha256:6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5
 pgsodium_release: "3.1.7"
 pgsodium_release_checksum: sha256:0a10aeda67d35cc7228b98c87d71ed6ebddfd51f037772eb373ec7e1e1626b8f
 
-pg_graphql_release: "1.2.0"
+pg_graphql_release: "1.2.2"
 
 pg_jsonschema_release: "0.1.4"
 
@@ -121,7 +121,7 @@ groonga_release_checksum: sha256:1c2d1a6981c1ad3f02a11aff202b15ba30cb1c6147f1fa9
 pgroonga_release: "3.0.7"
 pgroonga_release_checksum: sha256:885ff3878cc30e9030e5fc56d561bc8b66df3ede1562c9d802bc0ea04fe5c203
 
-wrappers_release: "0.1.11"
+wrappers_release: "0.1.14"
 
 hypopg_release: "1.3.1"
 hypopg_release_checksum: sha256:e7f01ee0259dc1713f318a108f987663d60f3041948c2ada57a94b469565ca8e

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

@@ -7,18 +7,17 @@ sed -i "s|gotrue_api_host|${GOTRUE_API_HOST:-0.0.0.0}|g" /etc/gotrue.env
 sed -i "s|gotrue_site_url|$GOTRUE_SITE_URL|g" /etc/gotrue.env
 sed -i "s|gotrue_jwt_secret|$JWT_SECRET|g" /etc/gotrue.env
 
-GOTRUE_CUSTOM_DIR="${DATA_VOLUME_MOUNTPOINT}/etc/gotrue"
-mkdir -p "${GOTRUE_CUSTOM_DIR}"
+GOTRUE_CUSTOM_CONFIG_FILE_PATH="${DATA_VOLUME_MOUNTPOINT}/etc/gotrue.env"
 if [ ! -f "${CONFIGURED_FLAG_PATH}" ]; then
-  echo "Copying existing custom GoTrue config from /etc/gotrue to ${GOTRUE_CUSTOM_DIR}"
-  cp -R "/etc/gotrue/." "${GOTRUE_CUSTOM_DIR}/"
+  echo "Copying existing GoTrue config from /etc/gotrue.env to ${GOTRUE_CUSTOM_CONFIG_FILE_PATH}"
+  cp "/etc/gotrue.env" "${GOTRUE_CUSTOM_CONFIG_FILE_PATH}"
 fi
 
-rm -rf "/etc/gotrue"
-ln -s "${GOTRUE_CUSTOM_DIR}" "/etc/gotrue"
-chown -R adminapi:adminapi "/etc/gotrue"
-chown -R adminapi:adminapi "${GOTRUE_CUSTOM_DIR}"
-chmod g+rx "${GOTRUE_CUSTOM_DIR}"
+rm "/etc/gotrue.env"
+ln -s "${GOTRUE_CUSTOM_CONFIG_FILE_PATH}" "/etc/gotrue.env"
+chown -R adminapi:adminapi "/etc/gotrue.env"
+chown -R adminapi:adminapi "${GOTRUE_CUSTOM_CONFIG_FILE_PATH}"
+chmod g+rx "${GOTRUE_CUSTOM_CONFIG_FILE_PATH}"
 
 if [ -f "${INIT_PAYLOAD_PATH:-}" ]; then
   echo "init gotrue payload"