From dd0e88bbcfbd7e376d93b0b83ba07b73ba8c85a0 Mon Sep 17 00:00:00 2001
From: josh <josh@joshjacobs.net>
Date: Fri, 22 Sep 2023 12:17:02 +0000
Subject: [PATCH 1/3] Update to latest ZT version Fixes #9

---
 Dockerfile         | 4 ++--
 docker-compose.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c5511ea..f91deeb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM debian:buster as stage
 ARG PACKAGE_BASEURL=https://download.zerotier.com/debian/buster/pool/main/z/zerotier-one
 ARG ARCH=amd64
-ARG VERSION=1.6.6
+ARG VERSION=1.12.2
 RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y ca-certificates=20200601~deb10u2 curl=7.64.0-4+deb10u2
 RUN curl -sSL -o zerotier-one.deb "${PACKAGE_BASEURL}/zerotier-one_${VERSION}_${ARCH}.deb"
 
@@ -14,4 +14,4 @@ RUN dpkg -i zerotier-one.deb && rm -f zerotier-one.deb
 RUN echo "${VERSION}" >/etc/zerotier-version
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod 755 /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index f6e8456..2130417 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 
 services:
   zerotierbridge:
@@ -8,7 +8,7 @@ services:
       dockerfile: Dockerfile
       args:
         ARCH: amd64
-        VERSION: 1.6.6
+        VERSION: 1.12.2
     restart: always
     privileged: true
     volumes:
@@ -17,4 +17,4 @@ services:
       - ZT_NETWORKS=NETWORK_ID_1 NETWORK_ID_2 NETWORK_ID_3
       - ZT_BRIDGE=true
 volumes:
-  zt_config:
\ No newline at end of file
+  zt_config:

From 7f56fec6897635e37b3e5aa13e7c3bbfddbce5da Mon Sep 17 00:00:00 2001
From: josh <josh@joshjacobs.net>
Date: Fri, 22 Sep 2023 12:18:33 +0000
Subject: [PATCH 2/3] fix: set proper workdir

---
 Dockerfile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f91deeb..a52186f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,12 +6,14 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y ca-cert
 RUN curl -sSL -o zerotier-one.deb "${PACKAGE_BASEURL}/zerotier-one_${VERSION}_${ARCH}.deb"
 
 FROM debian:buster
+RUN mkdir /app
+WORKDIR /app
 COPY --from=stage zerotier-one.deb .
 RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y procps=2:3.3.15-2 iptables=1.8.2-4 \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 RUN dpkg -i zerotier-one.deb && rm -f zerotier-one.deb
 RUN echo "${VERSION}" >/etc/zerotier-version
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
+COPY entrypoint.sh entrypoint.sh
+RUN chmod 755 entrypoint.sh
+ENTRYPOINT ["/app/entrypoint.sh"]
\ No newline at end of file

From 1298cea4fa1bad3141754e5218f449ec15e8469a Mon Sep 17 00:00:00 2001
From: josh <josh@joshjacobs.net>
Date: Fri, 22 Sep 2023 12:23:33 +0000
Subject: [PATCH 3/3] fix: add openssl dep and remove pinning will re-add
 pinning as a future task once the container works again

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a52186f..e072e52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,14 +2,14 @@ FROM debian:buster as stage
 ARG PACKAGE_BASEURL=https://download.zerotier.com/debian/buster/pool/main/z/zerotier-one
 ARG ARCH=amd64
 ARG VERSION=1.12.2
-RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y ca-certificates=20200601~deb10u2 curl=7.64.0-4+deb10u2
+RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y ca-certificates curl
 RUN curl -sSL -o zerotier-one.deb "${PACKAGE_BASEURL}/zerotier-one_${VERSION}_${ARCH}.deb"
 
 FROM debian:buster
 RUN mkdir /app
 WORKDIR /app
 COPY --from=stage zerotier-one.deb .
-RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y procps=2:3.3.15-2 iptables=1.8.2-4 \
+RUN apt-get update -qq && apt-get install -qq --no-install-recommends -y procps iptables openssl \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 RUN dpkg -i zerotier-one.deb && rm -f zerotier-one.deb