Skip to content

Commit

Permalink
Merge pull request #308 from PassiveLemon/Fix_307
Browse files Browse the repository at this point in the history
Fix #307
  • Loading branch information
tobychui authored Sep 17, 2024
2 parents 465f332 + a944c3f commit 75d7738
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN curl -Lo ZeroTierOne.tar.gz https://codeload.github.com/zerotier/ZeroTierOne
FROM docker.io/ubuntu:latest

RUN apt-get update -y &&\
apt-get install -y bash sudo netcat-openbsd libssl-dev
apt-get install -y bash sudo netcat-openbsd libssl-dev ca-certificates

COPY --chmod=700 ./entrypoint.sh /opt/zoraxy/
COPY --from=build-zoraxy /usr/local/bin/zoraxy /usr/local/bin/zoraxy
Expand Down
5 changes: 4 additions & 1 deletion docker/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/usr/bin/env bash

update-ca-certificates
echo "CA certificates updated"

if [ "$ZEROTIER" = "true" ]; then
echo "Starting ZeroTier daemon..."
zerotier-one -d
echo "ZeroTier daemon started"
fi

echo "Starting Zoraxy..."
Expand Down

0 comments on commit 75d7738

Please sign in to comment.