From 3b37db1a3699c415d5abeaa12d0e9f1ce4550b77 Mon Sep 17 00:00:00 2001
From: capruro <64908287+capruro@users.noreply.github.com>
Date: Fri, 3 Dec 2021 14:30:05 +0100
Subject: [PATCH 1/2] Version bump to 1.8.4

---
 ext/installfiles/linux/zerotier-containerized/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/installfiles/linux/zerotier-containerized/Dockerfile b/ext/installfiles/linux/zerotier-containerized/Dockerfile
index ab286e34c..f0386c800 100644
--- a/ext/installfiles/linux/zerotier-containerized/Dockerfile
+++ b/ext/installfiles/linux/zerotier-containerized/Dockerfile
@@ -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

From 3470c5314d039804ea4f3e166adf47f2ef8b5ac1 Mon Sep 17 00:00:00 2001
From: Sean OMeara <sean@sean.io>
Date: Mon, 13 Dec 2021 21:25:17 +0100
Subject: [PATCH 2/2] removing commit linter

---
 .github/workflows/badstrings.yml | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 .github/workflows/badstrings.yml

diff --git a/.github/workflows/badstrings.yml b/.github/workflows/badstrings.yml
deleted file mode 100644
index cb8e96690..000000000
--- a/.github/workflows/badstrings.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: badstrings
-on: [pull_request, push]
-jobs:
-  badstrings:
-    runs-on: ubuntu-latest
-    steps:
-      - name: scanning commit message for bad strings
-        run: |
-          #!/bin/bash
-          set -euo pipefail
-          IFS=$'\n\t'
-          message="${{ github.event.head_commit.message }}"
-          
-          strings=($(curl -s https://raw.githubusercontent.com/someara/badstrings/main/strings.txt))
-          for i in ${strings[@]} ; do
-            echo "${message}" | grep -v "$i" &>/dev/null;
-          done