[#13307] update dockerfiles and docker-maven-plugin

Author: ga-ram

.github/workflows/create-dockerfiles.yml

@@ -58,7 +58,7 @@ jobs:
       - name: Build Docker Images
         run: |
           mvn docker:build -pl agent-module/agent
-          mvn docker:build -pl hbase/hbase-docker
+          mvn docker:build -pl hbase
           mvn jib:build -pl collector-starter
           mvn jib:build -pl web-starter
           mvn jib:build -pl batch

agent-module/agent/Dockerfile

@@ -1,20 +1,20 @@
-FROM alpine:3.7
+FROM alpine:3.19 AS builder
 
-COPY Dockerfiles/configure-agent.sh /usr/local/bin/
 COPY target/pinpoint-agent-*.tar.gz /pinpoint-agent.tar.gz
 
-RUN apk add --update curl bash \
-    && chmod a+x /usr/local/bin/configure-agent.sh \
-    && mkdir -p /pinpoint-agent \
-    && chmod -R o+x /pinpoint-agent
+RUN mkdir -p /pinpoint-agent && \
+    tar -xzf /pinpoint-agent.tar.gz --strip 1 -C /pinpoint-agent && \
+    rm /pinpoint-agent.tar.gz
+
+FROM alpine:3.19
+
+COPY Dockerfiles/configure-agent.sh /usr/local/bin/
+COPY --from=builder /pinpoint-agent /pinpoint-agent
 
-RUN gunzip pinpoint-agent.tar.gz \
-    && tar -xf pinpoint-agent.tar --strip 1 -C /pinpoint-agent \
-    && rm pinpoint-agent.tar \
-    && apk del curl \
-    && rm /var/cache/apk/*
+RUN chmod a+x /usr/local/bin/configure-agent.sh && \
+    apk add --no-cache bash
 
 VOLUME ["/pinpoint-agent"]
 
 ENTRYPOINT ["/usr/local/bin/configure-agent.sh"]
-CMD ["tail", "-f", "/dev/null"]
+CMD ["tail", "-f", "/dev/null"]

agent-module/agent/pom.xml

@@ -195,16 +195,22 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.spotify</groupId>
+                <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.2</version>
+                <version>0.48.0</version>
                 <configuration>
-                    <imageName>${docker.repository.name}/pinpoint-agent</imageName>
-                    <dockerDirectory>${basedir}</dockerDirectory>
-                    <imageTags>
-                        <imageTag>${project.version}</imageTag>
-                        <imageTag>latest</imageTag>
-                    </imageTags>
+                    <images>
+                        <image>
+                            <name>${docker.repository.name}/pinpoint-agent</name>
+                            <build>
+                                <dockerFile>${basedir}/Dockerfile</dockerFile>
+                                <tags>
+                                    <tag>${project.version}</tag>
+                                    <tag>latest</tag>
+                                </tags>
+                            </build>
+                        </image>
+                    </images>
                 </configuration>
             </plugin>
         </plugins>

hbase/Dockerfile

@@ -1,30 +1,32 @@
-FROM openjdk:8u342-slim
-
-ARG HBASE_VERSION=${HBASE_VERSION:-2.2.6}
+FROM openjdk:8u342-slim AS builder
 
+ARG HBASE_VERSION=2.2.6
 ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
 ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase
-
 ENV BASE_DIR=/opt/hbase
-ENV HBASE_HOME=${BASE_DIR}/hbase-${HBASE_VERSION}
 
-COPY scripts/hbase-create.hbase ${BASE_DIR}/hbase-create.hbase
-COPY hbase-docker/Dockerfiles/configure-hbase.sh /usr/local/bin/configure-hbase.sh
-COPY hbase-docker/Dockerfiles/check-table.sh /usr/local/bin/check-table.sh
-COPY hbase-docker/Dockerfiles/initialize-hbase.sh /usr/local/bin/initialize-hbase.sh
+WORKDIR ${BASE_DIR}
+RUN apt-get update \
+    && apt-get install --no-install-recommends -y curl \
+    && rm -rf /var/lib/apt/lists/* \
+    && (curl -fSL "${HBASE_REPOSITORY}/${HBASE_VERSION}/hbase-${HBASE_VERSION}-bin.tar.gz" -o hbase.tar.gz \
+        || curl -fSL "${HBASE_SUB_REPOSITORY}/${HBASE_VERSION}/hbase-${HBASE_VERSION}-bin.tar.gz" -o hbase.tar.gz) \
+    && tar xfvz hbase.tar.gz -C ${BASE_DIR} \
+    && rm hbase.tar.gz
 
-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 \
-    && chmod a+x /usr/local/bin/configure-hbase.sh
+FROM openjdk:8u342-slim
 
-RUN mkdir -p ${BASE_DIR} \
-    && curl -fSL "${HBASE_REPOSITORY}/${HBASE_VERSION}/hbase-${HBASE_VERSION}-bin.tar.gz" -o hbase.tar.gz || curl -fSL "${HBASE_SUB_REPOSITORY}/${HBASE_VERSION}/hbase-${HBASE_VERSION}-bin.tar.gz" -o ${BASE_DIR}/hbase.tar.gz \
-    && tar xfvz ${BASE_DIR}/hbase.tar.gz -C ${BASE_DIR} \
-    && rm ${BASE_DIR}/hbase.tar.gz
+ARG HBASE_VERSION=2.2.6
+ENV BASE_DIR=/opt/hbase
+ENV HBASE_HOME=${BASE_DIR}/hbase-${HBASE_VERSION}
 
-COPY hbase-docker/Dockerfiles/hbase-site.xml ${HBASE_HOME}/conf/hbase-site.xml
-COPY hbase-docker/Dockerfiles/hbase-env.sh ${HBASE_HOME}/conf/hbase-env.sh
+WORKDIR ${BASE_DIR}
+COPY --from=builder ${BASE_DIR}/hbase-${HBASE_VERSION} ${BASE_DIR}/hbase-${HBASE_VERSION}
+COPY scripts/hbase-create.hbase ${BASE_DIR}/hbase-create.hbase
+COPY hbase-docker/configure-hbase.sh hbase-docker/check-table.sh hbase-docker/initialize-hbase.sh /usr/local/bin/
+COPY hbase-docker/hbase-site.xml ${HBASE_HOME}/conf/hbase-site.xml
+COPY hbase-docker/hbase-env.sh ${HBASE_HOME}/conf/hbase-env.sh
+RUN chmod a+x /usr/local/bin/*.sh
 
 VOLUME ["/home/pinpoint/hbase", "/home/pinpoint/zookeeper"]