void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-09-08 07:42:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

will this make arm64 containers work?

Browse source
This commit is contained in:
Grant Limberg 2025-09-04 13:08:27 -07:00
parent 2264452ad8
commit 7d5a60b44e
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ext/central-controller-docker/Dockerfile.conda
View file

@ -6,19 +6,20 @@ FROM continuumio/miniconda3:25.3.1-1
LABEL maintainer="ZeroTier Inc." LABEL maintainer="ZeroTier Inc."
ADD environment.yml /tmp/environment.yml ADD environment.yml /environment.yml
RUN conda env create -f /environment.yml && \
RUN conda env create -f /tmp/environment.yml conda clean -a -y
SHELL ["conda", "run", "--no-capture-output", "-n", "central_controller", "/bin/bash", "-c"]
COPY --from=go_base /go/bin/migrate /usr/local/bin/migrate COPY --from=go_base /go/bin/migrate /usr/local/bin/migrate
COPY ext/central-controller-docker/migrations /migrations COPY ext/central-controller-docker/migrations /migrations
ADD build/zerotier-one /usr/local/bin/zerotier-one ADD build/zerotier-one /usr/local/bin/zerotier-one
RUN chmod a+x /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 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 echo "/opt/conda/envs/central_controller/`uname -m`-conda-linux-gnu/lib" > /etc/ld.so.conf.d/conda-central-controller-x64.conf && \
ldconfig
ADD ext/central-controller-docker/main-new.sh /main.sh ADD ext/central-controller-docker/main-new.sh /main.sh
RUN chmod a+x /main.sh RUN chmod a+x /main.sh
SHELL ["conda", "run", "--no-capture-output", "-n", "central_controller", "/bin/bash", "-c"]
ENTRYPOINT ["conda", "run", "--no-capture-output", "-n", "central_controller", "/main.sh"] ENTRYPOINT ["conda", "run", "--no-capture-output", "-n", "central_controller", "/main.sh"]

2
ext/central-controller-docker/main-new.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# conda init # conda init
conda activate central_controller # conda activate central_controller
if [ -z "$ZT_DB_HOST" ]; then if [ -z "$ZT_DB_HOST" ]; then
echo '*** FAILED: ZT_DB_HOST environment variable not defined' echo '*** FAILED: ZT_DB_HOST environment variable not defined'