瀏覽代碼

try to make this work on both x64 & arm64

Grant Limberg 6 天之前
父節點
當前提交
2264452ad8
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      ext/central-controller-docker/Dockerfile.conda
  2. 1 1
      ext/central-controller-docker/main-new.sh

+ 2 - 2
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
 

+ 1 - 1
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'