From 8fdde78814d5d195c8e42c4a0bab5a95013f02b1 Mon Sep 17 00:00:00 2001 From: tomershafir Date: Mon, 13 Nov 2023 17:29:57 +0200 Subject: [PATCH] dedup examples dockerfile --- Makefile | 18 +++++++++--------- examples/{base => }/Dockerfile | 0 ...ker-compose.yml => docker-compose-base.yml} | 0 ...ker-compose.yml => docker-compose-expt.yml} | 0 examples/expt/Dockerfile | 13 ------------- 5 files changed, 9 insertions(+), 22 deletions(-) rename examples/{base => }/Dockerfile (100%) rename examples/{base/docker-compose.yml => docker-compose-base.yml} (100%) rename examples/{expt/docker-compose.yml => docker-compose-expt.yml} (100%) delete mode 100644 examples/expt/Dockerfile diff --git a/Makefile b/Makefile index ab60e14..f2929c9 100644 --- a/Makefile +++ b/Makefile @@ -22,14 +22,14 @@ publish: test: ./gradlew test -.PHONY: docker-example -docker-example: build - cp agent/build/libs/pyroscope.jar examples/base - docker-compose -f examples/base/docker-compose.yml build - docker-compose -f examples/base/docker-compose.yml up +.PHONY: docker-example-base +docker-example-base: build + cp agent/build/libs/pyroscope.jar examples + docker-compose -f examples/docker-compose-base.yml build + docker-compose -f examples/docker-compose-base.yml up -.PHONY: docker-example +.PHONY: docker-example-expt docker-example-expt: build - cp agent/build/libs/pyroscope.jar examples/expt - docker-compose -f examples/expt/docker-compose.yml build - docker-compose -f examples/expt/docker-compose.yml up + cp agent/build/libs/pyroscope.jar examples + docker-compose -f examples/docker-compose-expt.yml build + docker-compose -f examples/docker-compose-expt.yml up diff --git a/examples/base/Dockerfile b/examples/Dockerfile similarity index 100% rename from examples/base/Dockerfile rename to examples/Dockerfile diff --git a/examples/base/docker-compose.yml b/examples/docker-compose-base.yml similarity index 100% rename from examples/base/docker-compose.yml rename to examples/docker-compose-base.yml diff --git a/examples/expt/docker-compose.yml b/examples/docker-compose-expt.yml similarity index 100% rename from examples/expt/docker-compose.yml rename to examples/docker-compose-expt.yml diff --git a/examples/expt/Dockerfile b/examples/expt/Dockerfile deleted file mode 100644 index 196cfb8..0000000 --- a/examples/expt/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM openjdk:11.0.11-jdk - -ADD https://download.jboss.org/optaplanner/release/8.6.0.Final/optaweb-employee-rostering-distribution-8.6.0.Final.zip / - -RUN apt-get update && apt-get install -y unzip \ - && rm -rf /var/lib/apt/lists/* - -RUN unzip optaweb-employee-rostering-distribution-8.6.0.Final.zip && \ - rm optaweb-employee-rostering-distribution-8.6.0.Final.zip - -ADD pyroscope.jar / - -CMD ["java", "-javaagent:/pyroscope.jar", "-jar", "/optaweb-employee-rostering-distribution-8.6.0.Final/bin/optaweb-employee-rostering-standalone-8.6.0.Final/quarkus-run.jar"]