mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-09-07 07:12:52 +02:00
try to make this work on both x64 & arm64
This commit is contained in:
parent
73e3287fd6
commit
2264452ad8
2 changed files with 3 additions and 3 deletions
|
@ -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,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'
|
||||
|
|
Loading…
Add table
Reference in a new issue