diff --git a/.gitignore b/.gitignore index cf1dfa8ace..5385dfd421 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ compaction-suite-results.* # various files for local testing /proxy/.subzero +local_proxy.json diff --git a/compute/compute-node.Dockerfile b/compute/compute-node.Dockerfile index 1b98a981bf..c86d938c6d 100644 --- a/compute/compute-node.Dockerfile +++ b/compute/compute-node.Dockerfile @@ -1730,29 +1730,11 @@ FROM extensions-${EXTENSIONS} AS neon-pg-ext-build # Compile the Neon-specific `compute_ctl`, `fast_import`, and `local_proxy` binaries # ######################################################################################### -FROM $REPOSITORY/$IMAGE:$TAG AS compute-tools-plan -ARG BUILD_TAG -ENV BUILD_TAG=$BUILD_TAG - -WORKDIR /home/nonroot -USER nonroot - -# Copy entire project to get Cargo.* files with proper dependencies for the whole project -COPY --chown=nonroot . . -RUN cargo chef prepare --recipe-path recipe.json - -FROM $REPOSITORY/$IMAGE:$TAG AS compute-tools +FROM build-deps-with-cargo AS compute-tools ARG BUILD_TAG ENV BUILD_TAG=$BUILD_TAG USER nonroot - -COPY --from=compute-tools-plan /home/nonroot/recipe.json recipe.json -RUN --mount=type=cache,uid=1000,target=/home/nonroot/.cargo/registry \ - --mount=type=cache,uid=1000,target=/home/nonroot/.cargo/git \ - --mount=type=cache,uid=1000,target=/home/nonroot/target \ - mold -run cargo chef cook --locked --profile release-line-debug-size-lto --recipe-path recipe.json - # Copy entire project to get Cargo.* files with proper dependencies for the whole project COPY --chown=nonroot . . RUN --mount=type=cache,uid=1000,target=/home/nonroot/.cargo/registry \ @@ -2061,4 +2043,4 @@ RUN mkdir /var/run/rsyslogd && \ ENV LANG=en_US.utf8 USER postgres -ENTRYPOINT ["/usr/local/bin/compute_ctl"] +ENTRYPOINT ["/usr/local/bin/compute_ctl"] \ No newline at end of file diff --git a/local_proxy.json b/local_proxy.json deleted file mode 100644 index 0b77498af1..0000000000 --- a/local_proxy.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "jwks": [ - { - "id": "1", - "role_names": ["authenticator", "authenticated", "anon"], - "jwks_url": "https://climbing-minnow-11.clerk.accounts.dev/.well-known/jwks.json", - "provider_name": "foo", - "jwt_audience": null - } - ] -}