Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#143] Multi architecture support #145

Merged
merged 1 commit into from
Jul 28, 2022
Merged

[#143] Multi architecture support #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ services:

#zookeepers
zoo1:
image: zookeeper:3.4
image: zookeeper:3.4.13
restart: always
hostname: zoo1
expose:
Expand All @@ -266,7 +266,7 @@ services:
- pinpoint

zoo2:
image: zookeeper:3.4
image: zookeeper:3.4.13
restart: always
hostname: zoo2
expose:
Expand All @@ -282,7 +282,7 @@ services:
- pinpoint

zoo3:
image: zookeeper:3.4
image: zookeeper:3.4.13
restart: always
hostname: zoo3
expose:
Expand Down
4 changes: 2 additions & 2 deletions pinpoint-batch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pinpoint-collector/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
5 changes: 3 additions & 2 deletions pinpoint-hbase/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM java:8-jdk
FROM openjdk:8u342-slim

ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}

Expand All @@ -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} \
Expand Down
2 changes: 1 addition & 1 deletion pinpoint-mysql/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mysql:5.7
FROM mysql:8.0

ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}

Expand Down
4 changes: 2 additions & 2 deletions pinpoint-web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down