From 484d764e8a4363a8e95e44a5b1f43ca2e605033b Mon Sep 17 00:00:00 2001
From: Shaun L <534336+eleventy7@users.noreply.github.com>
Date: Thu, 9 Mar 2023 19:22:50 -0500
Subject: [PATCH] Remove aeroncookbook docker image; build docker from Azul
 image

---
 .envrc                                        |  6 -----
 .tool-versions                                |  3 ---
 LICENSE                                       |  2 +-
 aeron-mdc/aeron-mdc-publisher/Dockerfile      |  9 +++++--
 .../aeron-mdc-publisher}/setup-docker.sh      |  0
 aeron-mdc/aeron-mdc-subscriber/Dockerfile     |  9 +++++--
 .../aeron-mdc-subscriber/setup-docker.sh      | 27 +++++++++++++++++++
 archive-multi-host/archive-client/Dockerfile  |  9 +++++--
 .../archive-client/setup-docker.sh            | 27 +++++++++++++++++++
 archive-multi-host/archive-host/Dockerfile    |  9 +++++--
 .../archive-host/setup-docker.sh              | 27 +++++++++++++++++++
 archive-replication/archive-backup/Dockerfile |  8 ++++--
 .../archive-backup/setup-docker.sh            | 27 +++++++++++++++++++
 archive-replication/archive-client/Dockerfile |  8 ++++--
 .../archive-client/setup-docker.sh            | 27 +++++++++++++++++++
 archive-replication/archive-host/Dockerfile   |  8 ++++--
 .../archive-host/setup-docker.sh              | 27 +++++++++++++++++++
 docker/Dockerfile                             |  9 -------
 18 files changed, 209 insertions(+), 33 deletions(-)
 delete mode 100644 .envrc
 delete mode 100644 .tool-versions
 rename {docker => aeron-mdc/aeron-mdc-publisher}/setup-docker.sh (100%)
 create mode 100644 aeron-mdc/aeron-mdc-subscriber/setup-docker.sh
 create mode 100644 archive-multi-host/archive-client/setup-docker.sh
 create mode 100644 archive-multi-host/archive-host/setup-docker.sh
 create mode 100644 archive-replication/archive-backup/setup-docker.sh
 create mode 100644 archive-replication/archive-client/setup-docker.sh
 create mode 100644 archive-replication/archive-host/setup-docker.sh
 delete mode 100644 docker/Dockerfile

diff --git a/.envrc b/.envrc
deleted file mode 100644
index 8b001d53..00000000
--- a/.envrc
+++ /dev/null
@@ -1,6 +0,0 @@
-watch_file .tool-versions
-asdf plugin-add java || true
-asdf plugin-add gradle || true
-asdf install
-use asdf
-export JAVA_HOME="$(dirname "$(dirname "$(expand_path "$(asdf which java)" "/")")")"
diff --git a/.tool-versions b/.tool-versions
deleted file mode 100644
index f5ccfb03..00000000
--- a/.tool-versions
+++ /dev/null
@@ -1,3 +0,0 @@
-direnv 2.32.2
-java zulu-17.40.19
-gradle 8.0.1
diff --git a/LICENSE b/LICENSE
index 261eeb9e..b4473760 100644
--- a/LICENSE
+++ b/LICENSE
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/aeron-mdc/aeron-mdc-publisher/Dockerfile b/aeron-mdc/aeron-mdc-publisher/Dockerfile
index f2120abd..ec1b1936 100644
--- a/aeron-mdc/aeron-mdc-publisher/Dockerfile
+++ b/aeron-mdc/aeron-mdc-publisher/Dockerfile
@@ -1,8 +1,13 @@
 ARG REPO_NAME=docker.io/
-ARG IMAGE_NAME=aeroncookbook/jdk17
-ARG IMAGE_TAG=latest
+ARG IMAGE_NAME=azul/zulu-openjdk-debian
+ARG IMAGE_TAG=17
 FROM ${REPO_NAME}${IMAGE_NAME}:${IMAGE_TAG}
+
 SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]
+
+COPY --chmod=755 setup-docker.sh /root/dockerbuild/setup-docker.sh
+RUN /root/dockerbuild/setup-docker.sh && rm --recursive --force "/root/dockerbuild"
+
 WORKDIR /root/jar/
 COPY --chmod=755 /build/libs/aeron-mdc-publisher-uber.jar /root/jar/aeron-mdc-publisher-uber.jar
 COPY --chmod=755 entrypoint.sh /root/jar/entrypoint.sh
diff --git a/docker/setup-docker.sh b/aeron-mdc/aeron-mdc-publisher/setup-docker.sh
similarity index 100%
rename from docker/setup-docker.sh
rename to aeron-mdc/aeron-mdc-publisher/setup-docker.sh
diff --git a/aeron-mdc/aeron-mdc-subscriber/Dockerfile b/aeron-mdc/aeron-mdc-subscriber/Dockerfile
index 2bcaea63..5a708211 100644
--- a/aeron-mdc/aeron-mdc-subscriber/Dockerfile
+++ b/aeron-mdc/aeron-mdc-subscriber/Dockerfile
@@ -1,8 +1,13 @@
 ARG REPO_NAME=docker.io/
-ARG IMAGE_NAME=aeroncookbook/jdk17
-ARG IMAGE_TAG=latest
+ARG IMAGE_NAME=azul/zulu-openjdk-debian
+ARG IMAGE_TAG=17
 FROM ${REPO_NAME}${IMAGE_NAME}:${IMAGE_TAG}
+
 SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]
+
+COPY --chmod=755 setup-docker.sh /root/dockerbuild/setup-docker.sh
+RUN /root/dockerbuild/setup-docker.sh && rm --recursive --force "/root/dockerbuild"
+
 WORKDIR /root/jar/
 COPY --chmod=755 /build/libs/aeron-mdc-subscriber-uber.jar /root/jar/aeron-mdc-subscriber-uber.jar
 COPY --chmod=755 entrypoint.sh /root/jar/entrypoint.sh
diff --git a/aeron-mdc/aeron-mdc-subscriber/setup-docker.sh b/aeron-mdc/aeron-mdc-subscriber/setup-docker.sh
new file mode 100644
index 00000000..f04e7139
--- /dev/null
+++ b/aeron-mdc/aeron-mdc-subscriber/setup-docker.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+echo "debconf debconf/frontend select noninteractive" | debconf-set-selections
+
+apt-get update --quiet
+
+apt-get dist-upgrade --quiet --assume-yes
+
+apt-get install \
+    --quiet \
+    --assume-yes \
+    --no-install-recommends \
+    bash \
+    wget \
+    iproute2 \
+    less \
+    dnsutils \
+    procps \
+    sysstat
+
+mkdir /root/aeron
+mkdir /root/jar
+
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
+
+apt-get remove wget --quiet --assume-yes
diff --git a/archive-multi-host/archive-client/Dockerfile b/archive-multi-host/archive-client/Dockerfile
index 181ba780..581fe5c7 100644
--- a/archive-multi-host/archive-client/Dockerfile
+++ b/archive-multi-host/archive-client/Dockerfile
@@ -1,8 +1,13 @@
 ARG REPO_NAME=docker.io/
-ARG IMAGE_NAME=aeroncookbook/jdk17
-ARG IMAGE_TAG=latest
+ARG IMAGE_NAME=azul/zulu-openjdk-debian
+ARG IMAGE_TAG=17
 FROM ${REPO_NAME}${IMAGE_NAME}:${IMAGE_TAG}
+
 SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]
+
+COPY --chmod=755 setup-docker.sh /root/dockerbuild/setup-docker.sh
+RUN /root/dockerbuild/setup-docker.sh && rm --recursive --force "/root/dockerbuild"
+
 WORKDIR /root/jar/
 COPY --chmod=755 /build/libs/archive-client-uber.jar /root/jar/archive-client-uber.jar
 COPY --chmod=755 entrypoint.sh /root/jar/entrypoint.sh
diff --git a/archive-multi-host/archive-client/setup-docker.sh b/archive-multi-host/archive-client/setup-docker.sh
new file mode 100644
index 00000000..f04e7139
--- /dev/null
+++ b/archive-multi-host/archive-client/setup-docker.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+echo "debconf debconf/frontend select noninteractive" | debconf-set-selections
+
+apt-get update --quiet
+
+apt-get dist-upgrade --quiet --assume-yes
+
+apt-get install \
+    --quiet \
+    --assume-yes \
+    --no-install-recommends \
+    bash \
+    wget \
+    iproute2 \
+    less \
+    dnsutils \
+    procps \
+    sysstat
+
+mkdir /root/aeron
+mkdir /root/jar
+
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
+
+apt-get remove wget --quiet --assume-yes
diff --git a/archive-multi-host/archive-host/Dockerfile b/archive-multi-host/archive-host/Dockerfile
index db6f12b4..9090814e 100644
--- a/archive-multi-host/archive-host/Dockerfile
+++ b/archive-multi-host/archive-host/Dockerfile
@@ -1,8 +1,13 @@
 ARG REPO_NAME=docker.io/
-ARG IMAGE_NAME=aeroncookbook/jdk17
-ARG IMAGE_TAG=latest
+ARG IMAGE_NAME=azul/zulu-openjdk-debian
+ARG IMAGE_TAG=17
 FROM ${REPO_NAME}${IMAGE_NAME}:${IMAGE_TAG}
+
 SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]
+
+COPY --chmod=755 setup-docker.sh /root/dockerbuild/setup-docker.sh
+RUN /root/dockerbuild/setup-docker.sh && rm --recursive --force "/root/dockerbuild"
+
 WORKDIR /root/jar/
 COPY --chmod=755 /build/libs/archive-host-uber.jar /root/jar/archive-host-uber.jar
 COPY --chmod=755 entrypoint.sh /root/jar/entrypoint.sh
diff --git a/archive-multi-host/archive-host/setup-docker.sh b/archive-multi-host/archive-host/setup-docker.sh
new file mode 100644
index 00000000..f04e7139
--- /dev/null
+++ b/archive-multi-host/archive-host/setup-docker.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+echo "debconf debconf/frontend select noninteractive" | debconf-set-selections
+
+apt-get update --quiet
+
+apt-get dist-upgrade --quiet --assume-yes
+
+apt-get install \
+    --quiet \
+    --assume-yes \
+    --no-install-recommends \
+    bash \
+    wget \
+    iproute2 \
+    less \
+    dnsutils \
+    procps \
+    sysstat
+
+mkdir /root/aeron
+mkdir /root/jar
+
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
+
+apt-get remove wget --quiet --assume-yes
diff --git a/archive-replication/archive-backup/Dockerfile b/archive-replication/archive-backup/Dockerfile
index 7c47d2f4..1bd34f98 100644
--- a/archive-replication/archive-backup/Dockerfile
+++ b/archive-replication/archive-backup/Dockerfile
@@ -1,8 +1,12 @@
 ARG REPO_NAME=docker.io/
-ARG IMAGE_NAME=aeroncookbook/jdk17
-ARG IMAGE_TAG=latest
+ARG IMAGE_NAME=azul/zulu-openjdk-debian
+ARG IMAGE_TAG=17
 FROM ${REPO_NAME}${IMAGE_NAME}:${IMAGE_TAG}
+
 SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]
+
+COPY --chmod=755 setup-docker.sh /root/dockerbuild/setup-docker.sh
+RUN /root/dockerbuild/setup-docker.sh && rm --recursive --force "/root/dockerbuild"
 WORKDIR /root/jar/
 COPY --chmod=755 /build/libs/archive-backup-uber.jar /root/jar/archive-backup-uber.jar
 COPY --chmod=755 entrypoint.sh /root/jar/entrypoint.sh
diff --git a/archive-replication/archive-backup/setup-docker.sh b/archive-replication/archive-backup/setup-docker.sh
new file mode 100644
index 00000000..f04e7139
--- /dev/null
+++ b/archive-replication/archive-backup/setup-docker.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+echo "debconf debconf/frontend select noninteractive" | debconf-set-selections
+
+apt-get update --quiet
+
+apt-get dist-upgrade --quiet --assume-yes
+
+apt-get install \
+    --quiet \
+    --assume-yes \
+    --no-install-recommends \
+    bash \
+    wget \
+    iproute2 \
+    less \
+    dnsutils \
+    procps \
+    sysstat
+
+mkdir /root/aeron
+mkdir /root/jar
+
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
+
+apt-get remove wget --quiet --assume-yes
diff --git a/archive-replication/archive-client/Dockerfile b/archive-replication/archive-client/Dockerfile
index 181ba780..2e3bfb1e 100644
--- a/archive-replication/archive-client/Dockerfile
+++ b/archive-replication/archive-client/Dockerfile
@@ -1,8 +1,12 @@
 ARG REPO_NAME=docker.io/
-ARG IMAGE_NAME=aeroncookbook/jdk17
-ARG IMAGE_TAG=latest
+ARG IMAGE_NAME=azul/zulu-openjdk-debian
+ARG IMAGE_TAG=17
 FROM ${REPO_NAME}${IMAGE_NAME}:${IMAGE_TAG}
+
 SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]
+
+COPY --chmod=755 setup-docker.sh /root/dockerbuild/setup-docker.sh
+RUN /root/dockerbuild/setup-docker.sh && rm --recursive --force "/root/dockerbuild"
 WORKDIR /root/jar/
 COPY --chmod=755 /build/libs/archive-client-uber.jar /root/jar/archive-client-uber.jar
 COPY --chmod=755 entrypoint.sh /root/jar/entrypoint.sh
diff --git a/archive-replication/archive-client/setup-docker.sh b/archive-replication/archive-client/setup-docker.sh
new file mode 100644
index 00000000..f04e7139
--- /dev/null
+++ b/archive-replication/archive-client/setup-docker.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+echo "debconf debconf/frontend select noninteractive" | debconf-set-selections
+
+apt-get update --quiet
+
+apt-get dist-upgrade --quiet --assume-yes
+
+apt-get install \
+    --quiet \
+    --assume-yes \
+    --no-install-recommends \
+    bash \
+    wget \
+    iproute2 \
+    less \
+    dnsutils \
+    procps \
+    sysstat
+
+mkdir /root/aeron
+mkdir /root/jar
+
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
+
+apt-get remove wget --quiet --assume-yes
diff --git a/archive-replication/archive-host/Dockerfile b/archive-replication/archive-host/Dockerfile
index db6f12b4..ecdd012f 100644
--- a/archive-replication/archive-host/Dockerfile
+++ b/archive-replication/archive-host/Dockerfile
@@ -1,8 +1,12 @@
 ARG REPO_NAME=docker.io/
-ARG IMAGE_NAME=aeroncookbook/jdk17
-ARG IMAGE_TAG=latest
+ARG IMAGE_NAME=azul/zulu-openjdk-debian
+ARG IMAGE_TAG=17
 FROM ${REPO_NAME}${IMAGE_NAME}:${IMAGE_TAG}
+
 SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]
+
+COPY --chmod=755 setup-docker.sh /root/dockerbuild/setup-docker.sh
+RUN /root/dockerbuild/setup-docker.sh && rm --recursive --force "/root/dockerbuild"
 WORKDIR /root/jar/
 COPY --chmod=755 /build/libs/archive-host-uber.jar /root/jar/archive-host-uber.jar
 COPY --chmod=755 entrypoint.sh /root/jar/entrypoint.sh
diff --git a/archive-replication/archive-host/setup-docker.sh b/archive-replication/archive-host/setup-docker.sh
new file mode 100644
index 00000000..f04e7139
--- /dev/null
+++ b/archive-replication/archive-host/setup-docker.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+echo "debconf debconf/frontend select noninteractive" | debconf-set-selections
+
+apt-get update --quiet
+
+apt-get dist-upgrade --quiet --assume-yes
+
+apt-get install \
+    --quiet \
+    --assume-yes \
+    --no-install-recommends \
+    bash \
+    wget \
+    iproute2 \
+    less \
+    dnsutils \
+    procps \
+    sysstat
+
+mkdir /root/aeron
+mkdir /root/jar
+
+wget https://repo1.maven.org/maven2/io/aeron/aeron-all/1.40.0/aeron-all-1.40.0.jar -P /root/aeron/
+wget https://repo1.maven.org/maven2/io/aeron/aeron-agent/1.40.0/aeron-agent-1.40.0.jar -P /root/aeron/
+
+apt-get remove wget --quiet --assume-yes
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index 1f2d4f12..00000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-ARG REPO_NAME=docker.io/
-ARG IMAGE_NAME=azul/zulu-openjdk-debian
-ARG IMAGE_TAG=17
-FROM ${REPO_NAME}${IMAGE_NAME}:${IMAGE_TAG}
-
-SHELL [ "/bin/bash", "-o", "pipefail", "-c" ]
-
-COPY --chmod=755 setup-docker.sh /root/dockerbuild/setup-docker.sh
-RUN /root/dockerbuild/setup-docker.sh && rm --recursive --force "/root/dockerbuild"