MyoaEngineering
/
pinpoint-docker-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#143] Multi architecture support

This commit is contained in:
ga-ram 2022-07-28 18:24:05 +09:00
parent e5dd77dd36
commit 466d2b0c6c
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose.yml
View File

@ -250,7 +250,7 @@ services:
#zookeepers #zookeepers
zoo1: zoo1:
image: zookeeper:3.4 image: zookeeper:3.4.13
restart: always restart: always
hostname: zoo1 hostname: zoo1
expose: expose:
@ -266,7 +266,7 @@ services:
- pinpoint - pinpoint
zoo2: zoo2:
image: zookeeper:3.4 image: zookeeper:3.4.13
restart: always restart: always
hostname: zoo2 hostname: zoo2
expose: expose:
@ -282,7 +282,7 @@ services:
- pinpoint - pinpoint
zoo3: zoo3:
image: zookeeper:3.4 image: zookeeper:3.4.13
restart: always restart: always
hostname: zoo3 hostname: zoo3
expose: expose:

4
pinpoint-batch/Dockerfile
View File

@ -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 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 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/config/pinpoint-batch.properties /pinpoint/config/
COPY /build/scripts/start-batch.sh /pinpoint/scripts/ 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/scripts/start-batch.sh \
&& chmod a+x /pinpoint/config/pinpoint-batch.properties \ && chmod a+x /pinpoint/config/pinpoint-batch.properties \
&& curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-batch.jar && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-batch.jar

4
pinpoint-collector/Dockerfile
View File

@ -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 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 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 #temporary line for local test
#COPY /pinpoint-collector-boot-2.4.0-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar #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/scripts/start-collector.sh \
&& chmod a+x /pinpoint/config/pinpoint-collector.properties \ && chmod a+x /pinpoint/config/pinpoint-collector.properties \
&& curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-collector-boot.jar && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-collector-boot.jar

5
pinpoint-hbase/Dockerfile
View File

@ -1,4 +1,4 @@
FROM java:8-jdk FROM openjdk:8u342-slim
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0} 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/initialize-hbase.sh /usr/local/bin/
COPY /build/scripts/check-table.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 \ && chmod a+x /usr/local/bin/check-table.sh \
&& mkdir -p ${BASE_DIR} \ && mkdir -p ${BASE_DIR} \
&& cd ${BASE_DIR} \ && cd ${BASE_DIR} \

2
pinpoint-mysql/Dockerfile
View File

@ -1,4 +1,4 @@
FROM mysql:5.7 FROM mysql:8.0
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}

4
pinpoint-web/Dockerfile
View File

@ -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 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 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 #temporary line for local test
#COPY /pinpoint-web-boot-2.4.0-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar #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/scripts/start-web.sh \
&& chmod a+x /pinpoint/config/pinpoint-web.properties \ && chmod a+x /pinpoint/config/pinpoint-web.properties \
&& curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-web-boot.jar && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-web-boot.jar