From f67d109e6ea0dd554c0d6288362a7be0ddc60460 Mon Sep 17 00:00:00 2001 From: Rory de Zoete <33318916+zoete@users.noreply.github.com> Date: Thu, 25 Aug 2022 14:35:01 +0200 Subject: [PATCH] Copy binaries to /usr/local (#2335) * Add extra symlink * Take other approach Co-authored-by: Rory de Zoete --- Dockerfile.compute-node | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile.compute-node b/Dockerfile.compute-node index b5e639d5d6..117a4155cd 100644 --- a/Dockerfile.compute-node +++ b/Dockerfile.compute-node @@ -74,7 +74,7 @@ RUN mkdir /var/db && useradd -m -d /var/db/postgres postgres && \ # TODO: Check if we can make the extension setup more modular versus a linear build # currently plv8-build copies the output /usr/local/pgsql from postgis-build# -COPY --from=plv8-build --chown=postgres /usr/local/pgsql /usr/local/pgsql +COPY --from=plv8-build --chown=postgres /usr/local/pgsql /usr/local COPY --from=compute-tools --chown=postgres /home/nonroot/compute_tools/target/release/compute_ctl /usr/local/bin/compute_ctl RUN apt update && \ @@ -88,9 +88,8 @@ RUN echo "deb http://ftp.debian.org/debian testing main" >> /etc/apt/sources.lis apt install -y --no-install-recommends -t testing binutils && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -# "temporary" symlink for compatibility with old control-plane +# "temporary" symlink for old control-plane RUN ln -s /usr/local/bin/compute_ctl /usr/local/bin/zenith_ctl -ENV PATH=/usr/local/pgsql/bin:$PATH USER postgres ENTRYPOINT ["/usr/local/bin/compute_ctl"] \ No newline at end of file