From bc9fa38214435d003e442574cb19d0d11b1197da Mon Sep 17 00:00:00 2001
From: Jess Frazelle <jess@oxide.computer>
Date: Fri, 15 May 2020 09:38:57 -0700
Subject: [PATCH] fixups

Signed-off-by: Jess Frazelle <jess@oxide.computer>
---
 build-all.sh             |  2 +-
 latest-versions.sh       |  4 ++--
 zookeeper/3.5/Dockerfile | 23 -----------------------
 3 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 zookeeper/3.5/Dockerfile

diff --git a/build-all.sh b/build-all.sh
index 553530c..ae12f0b 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -32,7 +32,7 @@ build_and_push(){
 	done
 
 	# also push the tag latest for "stable" (chrome), "tools" (wireguard) or "3.5" tags for zookeeper
-	if [[ "$suite" == "stable" ]] || [[ "$suite" == "3.5" ]] || [[ "$suite" == "tools" ]]; then
+	if [[ "$suite" == "stable" ]] || [[ "$suite" == "3.6" ]] || [[ "$suite" == "tools" ]]; then
 		docker tag "${REPO_URL}/${base}:${suite}" "${REPO_URL}/${base}:latest"
 		docker push --disable-content-trust=false "${REPO_URL}/${base}:latest"
 	fi
diff --git a/latest-versions.sh b/latest-versions.sh
index 8c417b8..9a5fa5b 100755
--- a/latest-versions.sh
+++ b/latest-versions.sh
@@ -46,7 +46,7 @@ get_latest() {
 	elif [[ "$dir" == "Tautulli" ]]; then
 		dir="plexpy"
 	elif [[ "$dir" == "zookeeper" ]]; then
-		dir="zookeeper/3.5"
+		dir="zookeeper/3.6"
 	elif [[ "$dir" == "oauth2_proxy" ]]; then
 		dir="oauth2-proxy"
 	fi
@@ -92,7 +92,7 @@ get_latest_unifi() {
 
 compare() {
 	local name="$1" dir="$2" tag="$3" current="$4" releases="$5"
-	ignore_dirs=( "mc" "zookeeper/3.5" )
+	ignore_dirs=( "mc" )
 
 	if [[ "$tag" =~ $current ]] || [[ "$name" =~ $current ]] || [[ "$current" =~ $tag ]] || [[ "$current" == "master" ]]; then
 		echo -e "\\e[36m${dir}:\\e[39m current ${current} | ${tag} | ${name}"
diff --git a/zookeeper/3.5/Dockerfile b/zookeeper/3.5/Dockerfile
deleted file mode 100644
index 403be59..0000000
--- a/zookeeper/3.5/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM openjdk:8-alpine
-
-ENV ZOOKEEPER_VERSION 3.5.5
-ENV PATH $PATH:/opt/zookeeper/bin/
-
-# the start files for zookeeper use bash
-RUN apk --no-cache add \
-	bash
-
-RUN buildDeps=' \
-		curl \
-		tar \
-	' \
-	&& echo "==> Installing dependencies..." \
-	&& apk --no-cache add --virtual build-deps $buildDeps \
-	&& echo "==> Downloading Zookeeper..." \
-	&& mkdir -p /opt \
-	&& curl -sSL "http://apache.osuosl.org/zookeeper/zookeeper-${ZOOKEEPER_VERSION}/apache-zookeeper-${ZOOKEEPER_VERSION}.tar.gz" | tar -xzf - -C /opt \
-	&& mv /opt/apache-zookeeper-${ZOOKEEPER_VERSION} /opt/zookeeper \
-	&& cp /opt/zookeeper/conf/zoo_sample.cfg /opt/zookeeper/conf/zoo.cfg \
-	&& apk del build-deps
-
-ENTRYPOINT ["zkServer.sh", "start-foreground"]