Skip to content

Commit ee2bc63

Browse files
committed
feat: add origin protection key enforcement for envoy in lds.supabase.yaml
1 parent 2d9d454 commit ee2bc63

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ jobs:
7474
push: true
7575
build-args: |
7676
postgres_version=${{ needs.settings.outputs.base_docker_version }}
77+
envoy_lds=lds.supabase.yaml
7778
${{ needs.settings.outputs.build_args }}
7879
target: production
7980
tags: ${{ needs.settings.outputs.image_tag }}_${{ matrix.arch }}

ansible/tasks/internal/setup-envoy.yml

Whitespace-only changes.

ansible/vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ postgres_major:
1111

1212
# Full version strings for each major version
1313
postgres_release:
14-
postgres15: "15.8.1.010"
15-
postgres16: "16.3.1.016"
14+
postgres15: "15.8.1.011"
15+
postgres16: "16.3.1.017"
1616

1717
# Non Postgres Extensions
1818
pgbouncer_release: "1.19.0"

docker/all-in-one/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,12 @@ COPY docker/all-in-one/etc/gotrue.env /etc/gotrue.env
227227

228228
# Customizations for envoy
229229
ARG envoy_release
230+
ARG envoy_lds="lds.yaml"
230231
ADD --chmod=755 --chown=envoy:envoy "https://raw.githubusercontent.com/envoyproxy/envoy/v${envoy_release}/restarter/hot-restarter.py" /opt/envoy-hot-restarter.py
231-
COPY --chmod=775 --chown=envoy:envoy --exclude=*.supabase.yaml ansible/files/envoy_config/ /etc/envoy/
232+
COPY --chmod=775 --chown=envoy:envoy ansible/files/envoy_config/ /etc/envoy/
232233
COPY --chmod=755 --chown=envoy:envoy ansible/files/start-envoy.sh /opt/
234+
RUN mv /etc/envoy/${envoy_lds} /etc/envoy/lds.yaml
235+
RUN rm -f /etc/envoy/lds.supabase.yaml
233236

234237
# Customizations for kong
235238
COPY docker/all-in-one/etc/kong/kong.conf /etc/kong/kong.conf

0 commit comments

Comments
 (0)