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

run process in conda env directly from docker

Browse source
This commit is contained in:
Grant Limberg 2025-09-04 11:14:34 -07:00
parent 092fc268d3
commit d216a3739f
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,4 +20,6 @@ RUN echo "/opt/conda/envs/central_controller/lib" > /etc/ld.so.conf.d/conda-cent
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
ENTRYPOINT ["/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"]

8
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'
@ -133,12 +133,12 @@ if [ -n "$DB_SERVER_CA" ]; then
echo "secret list" echo "secret list"
chmod 600 /secrets/db/*.pem chmod 600 /secrets/db/*.pem
ls -l /secrets/db/ ls -l /secrets/db/
until /opt/conda/envs/central_controller/bin/pg_isready -h ${ZT_DB_HOST} -p ${ZT_DB_PORT} -d "sslmode=prefer sslcert=${DB_CLIENT_CERT} sslkey=${DB_CLIENT_KEY} sslrootcert=${DB_SERVER_CA}"; do until pg_isready -h ${ZT_DB_HOST} -p ${ZT_DB_PORT} -d "sslmode=prefer sslcert=${DB_CLIENT_CERT} sslkey=${DB_CLIENT_KEY} sslrootcert=${DB_SERVER_CA}"; do
echo "Waiting for PostgreSQL..."; echo "Waiting for PostgreSQL...";
sleep 2; sleep 2;
done done
else else
until /opt/conda/envs/central_controller/bin/pg_isready -h ${ZT_DB_HOST} -p ${ZT_DB_PORT}; do until pg_isready -h ${ZT_DB_HOST} -p ${ZT_DB_PORT}; do
echo "Waiting for PostgreSQL..."; echo "Waiting for PostgreSQL...";
sleep 2; sleep 2;
done done