From 602b224a9997f4decffb7cdfb4b5933ecf49d23e Mon Sep 17 00:00:00 2001 From: ga-ram Date: Mon, 25 Jul 2022 17:58:51 +0900 Subject: [PATCH] [#noissue] fix docker compose build failure --- pinpoint-mysql/Dockerfile | 9 +++------ pinpoint-quickstart/Dockerfile | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile index c07a520..f38ac65 100644 --- a/pinpoint-mysql/Dockerfile +++ b/pinpoint-mysql/Dockerfile @@ -2,10 +2,7 @@ FROM mysql:5.7 ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0} -RUN apt update \ - && apt-get install -y --no-install-recommends ca-certificates wget \ - && wget -O /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql" \ - && wget -O /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobRepositorySchema-mysql.sql" \ +RUN curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql" -o /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql \ + && curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobRepositorySchema-mysql.sql" -o /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \ && sed -i '/^--/d' /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql \ - && sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \ - && apt-get purge -y --auto-remove ca-certificates wget + && sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \ No newline at end of file diff --git a/pinpoint-quickstart/Dockerfile b/pinpoint-quickstart/Dockerfile index b38ff5f..9c0362c 100644 --- a/pinpoint-quickstart/Dockerfile +++ b/pinpoint-quickstart/Dockerfile @@ -4,6 +4,8 @@ COPY /build/pinpoint-quickstart-testapp.war quickstart.war RUN rm -rf /usr/local/tomcat/webapps \ && mkdir -p /usr/local/tomcat/webapps \ + && apt-get update \ + && apt-get install --no-install-recommends -y unzip\ && unzip quickstart.war -d /usr/local/tomcat/webapps/ROOT \ && rm -rf quickstart.war