From e48f29a9852a4035bf77e370a5ba220027e58238 Mon Sep 17 00:00:00 2001
From: ga-ram <galam.choi@navercorp.com>
Date: Thu, 28 Jul 2022 18:24:05 +0900
Subject: [PATCH] [#143] Multi architecture support

---
 docker-compose.yml            | 6 +++---
 pinpoint-batch/Dockerfile     | 4 ++--
 pinpoint-collector/Dockerfile | 4 ++--
 pinpoint-hbase/Dockerfile     | 5 +++--
 pinpoint-mysql/Dockerfile     | 2 +-
 pinpoint-web/Dockerfile       | 4 ++--
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 23505da..427e1d4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -250,7 +250,7 @@ services:
 
   #zookeepers
   zoo1:
-    image: zookeeper:3.4
+    image: zookeeper:3.4.13
     restart: always
     hostname: zoo1
     expose:
@@ -266,7 +266,7 @@ services:
       - pinpoint
 
   zoo2:
-    image: zookeeper:3.4
+    image: zookeeper:3.4.13
     restart: always
     hostname: zoo2
     expose:
@@ -282,7 +282,7 @@ services:
       - pinpoint
 
   zoo3:
-    image: zookeeper:3.4
+    image: zookeeper:3.4.13
     restart: always
     hostname: zoo3
     expose:
diff --git a/pinpoint-batch/Dockerfile b/pinpoint-batch/Dockerfile
index 562a5b7..3314830 100644
--- a/pinpoint-batch/Dockerfile
+++ b/pinpoint-batch/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.14.1_1-alpine-slim
+FROM openjdk:11.0.16-jre-slim-buster
 
 ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-batch-${PINPOINT_VERSION}.jar
@@ -9,7 +9,7 @@ RUN mkdir -p /pinpoint/config \
 COPY /build/config/pinpoint-batch.properties /pinpoint/config/
 COPY /build/scripts/start-batch.sh /pinpoint/scripts/
 
-RUN apk --no-cache add curl \
+RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
     && chmod a+x /pinpoint/scripts/start-batch.sh \
     && chmod a+x /pinpoint/config/pinpoint-batch.properties \
     && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-batch.jar
diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile
index 1785822..d62544f 100644
--- a/pinpoint-collector/Dockerfile
+++ b/pinpoint-collector/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.14.1_1-alpine-slim
+FROM openjdk:11.0.16-jre-slim-buster
 
 ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar
@@ -11,7 +11,7 @@ COPY /build/scripts/start-collector.sh /pinpoint/scripts/
 #temporary line for local test
 #COPY /pinpoint-collector-boot-2.4.0-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
 
-RUN apk --no-cache add curl \
+RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
     && chmod a+x /pinpoint/scripts/start-collector.sh \
     && chmod a+x /pinpoint/config/pinpoint-collector.properties \
     && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-collector-boot.jar
diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile
index fdf0233..5ec9976 100644
--- a/pinpoint-hbase/Dockerfile
+++ b/pinpoint-hbase/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:8-jdk
+FROM openjdk:8u342-slim
 
 ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
 
@@ -14,7 +14,8 @@ COPY hbase-env.sh hbase-env.sh
 COPY /build/scripts/initialize-hbase.sh /usr/local/bin/
 COPY /build/scripts/check-table.sh /usr/local/bin/
 
-RUN chmod a+x /usr/local/bin/initialize-hbase.sh \
+RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
+    && chmod a+x /usr/local/bin/initialize-hbase.sh \
     && chmod a+x /usr/local/bin/check-table.sh \
     && mkdir -p ${BASE_DIR} \
     && cd ${BASE_DIR} \
diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile
index f38ac65..6561381 100644
--- a/pinpoint-mysql/Dockerfile
+++ b/pinpoint-mysql/Dockerfile
@@ -1,4 +1,4 @@
-FROM mysql:5.7
+FROM mysql:8.0
 
 ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
 
diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile
index 4b51608..2653452 100644
--- a/pinpoint-web/Dockerfile
+++ b/pinpoint-web/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11:jdk-11.0.14.1_1-alpine-slim
+FROM openjdk:11.0.16-jre-slim-buster
 
 ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar
@@ -11,7 +11,7 @@ COPY /build/scripts/start-web.sh /pinpoint/scripts/
 #temporary line for local test
 #COPY /pinpoint-web-boot-2.4.0-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
 
-RUN apk --no-cache add curl \
+RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
     && chmod a+x /pinpoint/scripts/start-web.sh \
     && chmod a+x /pinpoint/config/pinpoint-web.properties \
     && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-web-boot.jar