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

[#noissue] fix docker compose build failure

This commit is contained in:
ga-ram 2022-07-25 17:58:51 +09:00
parent 3a6805e9ec
commit 602b224a99
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pinpoint-mysql/Dockerfile
View File

@ -2,10 +2,7 @@ FROM mysql:5.7
ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0} ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.0}
RUN apt update \ 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 \
&& apt-get install -y --no-install-recommends ca-certificates wget \ && 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 \
&& 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" \
&& sed -i '/^--/d' /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql \ && sed -i '/^--/d' /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql \
&& sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \ && sed -i '/^--/d' /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql
&& apt-get purge -y --auto-remove ca-certificates wget

2
pinpoint-quickstart/Dockerfile
View File

@ -4,6 +4,8 @@ COPY /build/pinpoint-quickstart-testapp.war quickstart.war
RUN rm -rf /usr/local/tomcat/webapps \ RUN rm -rf /usr/local/tomcat/webapps \
&& mkdir -p /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 \ && unzip quickstart.war -d /usr/local/tomcat/webapps/ROOT \
&& rm -rf quickstart.war && rm -rf quickstart.war