mirror of
https://github.com/xubiaolin/docker-zerotier-planet.git
synced 2025-01-22 12:48:14 -05:00
support arm
This commit is contained in:
parent
9f5b5f8435
commit
f5538d300d
@ -71,7 +71,6 @@ COPY --from=builder /var/lib/zerotier-one /bak/zerotier-one
|
||||
COPY --from=builder /app/ZeroTierOne/zerotier-one /usr/sbin/zerotier-one
|
||||
COPY --from=builder /app/entrypoint.sh /app/entrypoint.sh
|
||||
COPY --from=builder /app/http_server.js /app/http_server.js
|
||||
COPY --from=builder /app/ZeroTierOne/attic/world/mkworld /var/lib/zerotier-one/mkworld
|
||||
|
||||
RUN set -x \
|
||||
&& apk update \
|
||||
|
3
build.sh
3
build.sh
@ -5,6 +5,7 @@ REPO=ZeroTierOne
|
||||
|
||||
latest_tag=$(curl -s "https://api.github.com/repos/$USER/$REPO/tags" | jq -r '.[].name' | grep -E "^[0-9]+\.[0-9]+\.[0-9]+$" | sort -V | tail -n 1)
|
||||
|
||||
echo "Latest tag for $USER/$REPO matching the format digit.digit.digit is: $latest_tag"
|
||||
echo "Latest tag for $USER/$REPO matching latest is: $latest_tag"
|
||||
|
||||
docker build --build-arg TAG="$latest_tag" -t "xubiaolin/zerotier-planet:$latest_tag" .
|
||||
docker tag "xubiaolin/zerotier-planet:$latest_tag" "xubiaolin/zerotier-planet:latest"
|
||||
|
@ -64,7 +64,7 @@ function check_zerotier() {
|
||||
jq --argjson newEndpoints "$stableEndpoints" '.roots[0].stableEndpoints = $newEndpoints' moon.json >temp.json && mv temp.json moon.json
|
||||
./zerotier-idtool genmoon moon.json && mkdir -p moons.d && cp ./*.moon ./moons.d
|
||||
|
||||
./mkworld moon.json
|
||||
./mkworld
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "mkmoonworld failed!"
|
||||
exit 1
|
||||
|
@ -92,7 +92,7 @@ int jsonToBinary() {
|
||||
const uint64_t ts = 1567191349589ULL; // August 30th, 2019
|
||||
|
||||
std::string fileContent;
|
||||
if (!OSUtils::readFile("config.json", fileContent)) {
|
||||
if (!OSUtils::readFile("moon.json", fileContent)) {
|
||||
fprintf(stderr, "Failed to open config file." ZT_EOL_S);
|
||||
return 1;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user