Skip to content

Commit

Permalink
Upgraded spring dependency (boot 3.3) and jdk 17: changed swagger and…
Browse files Browse the repository at this point in the history
… metric monitoring; add docker compose for POC with grafana and prometheus; still a problem with docker on root project
  • Loading branch information
Massimo Ugues committed May 29, 2024
1 parent 4a89661 commit 45104c0
Show file tree
Hide file tree
Showing 17 changed files with 9,804 additions and 117 deletions.
10 changes: 1 addition & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
#FROM openjdk:8-jdk-alpine
#VOLUME /tmp
#ARG DEPENDENCY=target/dependency
#COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
#COPY ${DEPENDENCY}/META-INF /app/META-INF
#COPY ${DEPENDENCY}/BOOT-INF/classes /app
#ENTRYPOINT ["java","-cp","app:app/lib/*","com.sample.Application"]

FROM java:8-jdk-alpine
FROM java:17-jdk-alpine
COPY ./target/spring-boot-docker-0.0.1-SNAPSHOT.jar /usr/app/
WORKDIR /usr/app
RUN sh -c 'touch spring-boot-docker-0.0.1-SNAPSHOT.jar'
Expand Down
19 changes: 19 additions & 0 deletions monitoring/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: '3.7'

services:
prometheus:
image: prom/prometheus:v2.44.0
container_name: prometheus
ports:
- "9090:9090"
volumes:
- ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml

grafana:
image: grafana/grafana:9.5.2
container_name: grafana
ports:
- "3000:3000"
restart: unless-stopped
volumes:
- ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources
Loading

0 comments on commit 45104c0

Please sign in to comment.