From 2b1b93e89fadf4d19dedc8ee753dc6fad815ba14 Mon Sep 17 00:00:00 2001
From: Flip Hess <flip@fliphess.com>
Date: Thu, 7 Mar 2024 16:28:00 +0100
Subject: [PATCH] Build for tiqets

---
 build-and-push-tiqets.sh | 19 +++++++++++++++++++
 build/Dockerfile         |  5 +----
 docker/Dockerfile        |  4 ++--
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 build-and-push-tiqets.sh

diff --git a/build-and-push-tiqets.sh b/build-and-push-tiqets.sh
new file mode 100644
index 000000000..3b77be0b8
--- /dev/null
+++ b/build-and-push-tiqets.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e -u -o pipefail
+
+BASE=129317782449.dkr.ecr.eu-west-1.amazonaws.com
+TAG=0.2.15.1
+
+docker buildx build \
+        --push \
+		--build-arg VERSION="${TAG}" \
+		--platform linux/arm64,linux/amd64 \
+		-t "${BASE}/zookeeper-operator":"${TAG}" \
+		.
+
+docker buildx build \
+        --push \
+		--build-arg VERSION="${TAG}" \
+		--platform linux/arm64,linux/amd64 \
+		-t "${BASE}/zookeeper":"${TAG}" \
+		./docker
diff --git a/build/Dockerfile b/build/Dockerfile
index ee278e305..95c8e2e13 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,7 +1,4 @@
 FROM alpine:3.8
-
 RUN apk upgrade --update --no-cache
-
 USER nobody
-
-ADD build/_output/bin/zookeeper-operator /usr/local/bin/zookeeper-operator
+COPY build/_output/bin/zookeeper-operator /usr/local/bin/zookeeper-operator
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 368f7a9dc..12e8132ef 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -9,13 +9,13 @@
 #
 
 ARG DOCKER_REGISTRY
-FROM  ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}openjdk:11-jdk
+FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}openjdk:11-jdk
 RUN mkdir /zu
 COPY zu /zu
 WORKDIR /zu
 RUN ./gradlew --console=verbose --info shadowJar
 
-FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}zookeeper:3.7.2
+FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}zookeeper:3.9.1-jre-11
 COPY bin /usr/local/bin
 RUN chmod +x /usr/local/bin/*
 COPY --from=0 /zu/build/libs/zu.jar /opt/libs/