github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-14 10:37:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' into zeroidc

Browse source
This commit is contained in:
Grant Limberg 2022-01-03 08:37:10 -08:00
commit cb9313a454
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A
6 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/installfiles/linux/zerotier-containerized/Dockerfile
View file

@ -7,11 +7,11 @@ FROM debian:buster-slim as builder
RUN apt-get update && apt-get install -y curl gnupg
RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 0x1657198823e52a61 && \
echo "deb http://download.zerotier.com/debian/buster buster main" > /etc/apt/sources.list.d/zerotier.list
RUN apt-get update && apt-get install -y zerotier-one=1.6.2
RUN apt-get update && apt-get install -y zerotier-one=1.8.4
COPY ext/installfiles/linux/zerotier-containerized/main.sh /var/lib/zerotier-one/main.sh
FROM debian:buster-slim
LABEL version="1.6.3"
LABEL version="1.8.4"
LABEL description="Containerized ZeroTier One for use on CoreOS or other Docker-only Linux hosts."
# ZeroTier relies on UDP port 9993

2
ext/installfiles/mac/ZeroTier One.pkgproj
View file

@ -701,7 +701,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
<string>1.8.4</string>
<string>1.8.5</string>
</dict>
<key>TYPE</key>
<integer>0</integer>