From 2264452ad874c0f9551fc6bc23f4d70e59dc30ca Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Thu, 4 Sep 2025 12:19:53 -0700 Subject: [PATCH] try to make this work on both x64 & arm64 --- ext/central-controller-docker/Dockerfile.conda | 4 ++-- ext/central-controller-docker/main-new.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/central-controller-docker/Dockerfile.conda b/ext/central-controller-docker/Dockerfile.conda index 2193cbc73..ad73f9d4c 100644 --- a/ext/central-controller-docker/Dockerfile.conda +++ b/ext/central-controller-docker/Dockerfile.conda @@ -14,8 +14,8 @@ COPY --from=go_base /go/bin/migrate /usr/local/bin/migrate COPY ext/central-controller-docker/migrations /migrations ADD build/zerotier-one /usr/local/bin/zerotier-one RUN chmod a+x /usr/local/bin/zerotier-one -RUN echo "/opt/conda/envs/central_controller/lib" > /etc/ld.so.conf.d/conda-central-controller.conf && ldconfig - +# RUN echo "/opt/conda/envs/central_controller/lib" > /etc/ld.so.conf.d/conda-central-controller.conf +# RUN echo "/opt/conda/envs/central_controller/x86_64-conda-linux-gnu/lib" > /etc/ld.so.conf.d/conda-central-controller-gnu.conf && ldconfig ADD ext/central-controller-docker/main-new.sh /main.sh RUN chmod a+x /main.sh diff --git a/ext/central-controller-docker/main-new.sh b/ext/central-controller-docker/main-new.sh index f40933ef2..9901c2827 100755 --- a/ext/central-controller-docker/main-new.sh +++ b/ext/central-controller-docker/main-new.sh @@ -1,7 +1,7 @@ #!/bin/bash # conda init -# conda activate central_controller +conda activate central_controller if [ -z "$ZT_DB_HOST" ]; then echo '*** FAILED: ZT_DB_HOST environment variable not defined'