diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 95615dd..f3918db 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -2,7 +2,7 @@ name: Deploy with Docker on: push: - branches: [ master ] + branches: [ master, build/* ] env: DOCKER_IMAGE: ghcr.io/${{ github.actor }}/sbb diff --git a/Dockerfile b/Dockerfile index fa0f3bc..3e9b921 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,4 +15,12 @@ COPY --from=build ${EXTRACTED}/dependencies/ ./ COPY --from=build ${EXTRACTED}/spring-boot-loader/ ./ COPY --from=build ${EXTRACTED}/snapshot-dependencies/ ./ COPY --from=build ${EXTRACTED}/application/ ./ -ENTRYPOINT ["java","org.springframework.boot.loader.JarLauncher"] \ No newline at end of file + +ARG PINPOINT_VERSION +ARG AGENT_ID +ARG APP_NAME +ARG SPRING_PROFILES + +ARG JAVA_OPTS="-javaagent:/pinpoint-agent/pinpoint-bootstrap-${PINPOINT_VERSION}.jar -Dpinpoint.agentId=${AGENT_ID} -Dpinpoint.applicationName=${APP_NAME} -Dpinpoint.profiler.profiles.active=${SPRING_PROFILES}" + +ENTRYPOINT ["java","${JAVA_OPT}","org.springframework.boot.loader.JarLauncher"] \ No newline at end of file