chore: fix variable name during fly init (supabase#666)

* chore: fix variable name * chore: fix variable name

Author: pcnc

.github/workflows/dockerhub-release-aio.yml

@@ -3,7 +3,7 @@ name: Release AIO image on Dockerhub
 on:
  push:
  branches:
- - pcnc/fly-fixes
+ - pcnc/trigger-build
  paths:
  - ".github/workflows/dockerhub-release-aio.yml"
  - "docker/all-in-one/*"

common.vars.pkr.hcl

@@ -1 +1 @@
-postgres-version = "15.1.0.93"
+postgres-version = "15.1.0.92"

docker/all-in-one/Dockerfile

@@ -221,7 +221,7 @@ RUN useradd --create-home --shell /bin/bash postgrest && \
 RUN mkdir -p /etc/wal-g && \
  chown -R adminapi:adminapi /etc/wal-g && \
  chmod g+w /etc/wal-g
-RUN mkdir -p /var/log/wal-g && chown -R postgres:postgres /var/log/wal-g && chmod +x /usr/bin/admin-mgr && chmod ug+s /usr/bin/admin-mgr && touch /etc/wal-g/config.json && chown adminapi:adminapi /etc/wal-g/config.json
+RUN mkdir -p /var/log/wal-g && chown -R postgres:postgres /var/log/wal-g && chmod +x /usr/bin/admin-mgr && chmod ug+s /usr/bin/admin-mgr && touch /etc/wal-g/config.json && chown adminapi:adminapi /etc/wal-g/config.json && echo '{}' > /etc/wal-g/config.json
 RUN chown -R adminapi:adminapi /etc/adminapi
 
 # Add healthcheck and entrypoint scripts

docker/all-in-one/entrypoint.sh

@@ -177,8 +177,10 @@ fi
 export INIT_PAYLOAD_PATH=${INIT_PAYLOAD_PATH:-/tmp/payload.tar.gz}
 
 if [ "${INIT_PAYLOAD_PRESIGNED_URL:-}" ]; then
- curl -fsSL "$INIT_PAYLOAD_PRESIGNED_URL" -o "/tmp/payload.tar.gz"
- mv "/tmp/payload.tar.gz" "$INIT_PAYLOAD_PATH"
+ curl -fsSL "$INIT_PAYLOAD_PRESIGNED_URL" -o "/tmp/payload.tar.gz" || true
+ if [ -f "/tmp/payload.tar.gz" ]; then
+ mv "/tmp/payload.tar.gz" "$INIT_PAYLOAD_PATH"
+ fi
 fi
 
 if [ "${DATA_VOLUME_MOUNTPOINT}" ]; then
@@ -190,7 +192,7 @@ if [ "${DATA_VOLUME_MOUNTPOINT}" ]; then
  ln -s "${BASE_LOGS_FOLDER}/${folder}" "/var/log/${folder}"
  done
 
- chown -R postgres:postgres "${LOGS_FOLDER}"
+ chown -R postgres:postgres "${BASE_LOGS_FOLDER}"
 fi
 
 # Process init payload