diff --git a/.dockerignore b/.dockerignore index a6e11805e9..960588b6f2 100644 --- a/.dockerignore +++ b/.dockerignore @@ -21,4 +21,5 @@ !workspace_hack/ !neon_local/ !scripts/ninstall.sh +!scripts/combine_control_files.py !vm-cgconfig.conf diff --git a/Dockerfile.compute-node b/Dockerfile.compute-node index a7e3b8b651..6d69da1ef3 100644 --- a/Dockerfile.compute-node +++ b/Dockerfile.compute-node @@ -769,10 +769,10 @@ COPY --from=pg-anon-pg-build /control_files/anon.control /control_files/anon.con COPY --from=pg-embedding-pg-build /extensions/embedding.tar.gz /extensions/embedding.tar.gz COPY --from=pg-embedding-pg-build /control_files/embedding.control /control_files/embedding.control -# FROM python:3.11-slim-bookworm -RUN apt install python3 -COPY ./combine_control_files.py combine_control_files.py -CMD [ "python3", "./scripts/combine_control_files.py"] +FROM python:3.11-slim-bookworm AS alekpython +COPY scripts/combine_control_files.py combine_control_files.py +COPY --from=postgres-extensions /control_files /control_files +CMD [ "python3", "./combine_control_files.py"] ######################################################################################### # diff --git a/scripts/combine_control_files.py b/scripts/combine_control_files.py index cf91e3e284..a16f4586f3 100644 --- a/scripts/combine_control_files.py +++ b/scripts/combine_control_files.py @@ -1,6 +1,9 @@ import json import os +with open("SOMETHING", "w") as f: + f.write("SOMETHING") + # enable custom extensions for specific tenants enabled_extensions = {"123454321": ["anon"], "public": ["embedding"]}