Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to latest versions #55

Merged
merged 16 commits into from
Dec 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions generators/server/templates/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:17-jre-focal as builder
FROM eclipse-temurin:17.0.5_8-jre-focal as builder
WORKDIR application
<%_ if (buildTool === 'maven') { _%>
ARG JAR_FILE=target/<%= appName %>-<%= DEFAULT_APP_VERSION %>.jar
Expand All @@ -10,7 +10,7 @@ COPY ${JAR_FILE} application.jar
RUN java -Djarmode=layertools -jar application.jar extract

# the second stage of our build will copy the extracted layers
FROM eclipse-temurin:17-jre-focal
FROM eclipse-temurin:17.0.5_8-jre-focal
WORKDIR application
COPY --from=builder application/dependencies/ ./
COPY --from=builder application/spring-boot-loader/ ./
Expand Down
6 changes: 3 additions & 3 deletions generators/server/templates/app/docker/docker-compose-elk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.8'
services:

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.7
container_name: elasticsearch
environment:
- cluster.name=docker-cluster
Expand All @@ -20,7 +20,7 @@ services:
hard: -1

logstash:
image: docker.elastic.co/logstash/logstash:7.17.6
image: docker.elastic.co/logstash/logstash:7.17.7
container_name: logstash
command: logstash -f /etc/logstash/conf.d/logstash.conf
volumes:
Expand All @@ -31,7 +31,7 @@ services:
- elasticsearch

kibana:
image: docker.elastic.co/kibana/kibana:7.17.6
image: docker.elastic.co/kibana/kibana:7.17.7
container_name: kibana
environment:
- ELASTICSEARCH_URL=http://elasticsearch:9200
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.8'
services:

grafana:
image: grafana/grafana:9.1.1
image: grafana/grafana:9.2.6
ports:
- "3000:3000"
volumes:
Expand All @@ -16,7 +16,7 @@ services:
- prometheus

prometheus:
image: prom/prometheus:v2.38.0
image: prom/prometheus:v2.40.3
ports:
- "9090:9090"
volumes:
Expand Down