Skip to content

Commit e2d2ea7

Browse files
authored
Merge pull request #728 from madduci/rel_7_3_tracking
Updated Dockerfile and pom.xml
2 parents 9c7bd11 + cb3e0ae commit e2d2ea7

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.github/workflows/build-images.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
jobs:
1818
build:
1919
name: Build
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-22.04
2121
steps:
2222
- name: Container meta for default (distroless) image
2323
id: docker_meta

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/library/maven:3.9.7-eclipse-temurin-17 AS build-hapi
1+
FROM docker.io/library/maven:3.9.9-eclipse-temurin-17 AS build-hapi
22
WORKDIR /tmp/hapi-fhir-jpaserver-starter
33

44
ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.33.3

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
ports:
1313
- "8080:8080"
1414
hapi-fhir-postgres:
15-
image: postgres:14-alpine
15+
image: postgres:15-alpine
1616
container_name: hapi-fhir-postgres
1717
restart: always
1818
environment:

pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -354,14 +354,14 @@
354354
<dependency>
355355
<groupId>io.micrometer</groupId>
356356
<artifactId>micrometer-core</artifactId>
357-
<version>1.11.3</version>
357+
<version>1.13.3</version>
358358
</dependency>
359359

360360
<!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus -->
361361
<dependency>
362362
<groupId>io.micrometer</groupId>
363363
<artifactId>micrometer-registry-prometheus</artifactId>
364-
<version>1.11.3</version>
364+
<version>1.13.3</version>
365365
</dependency>
366366

367367
<dependency>
@@ -402,7 +402,7 @@
402402
<plugin>
403403
<groupId>org.apache.maven.plugins</groupId>
404404
<artifactId>maven-surefire-plugin</artifactId>
405-
<version>3.2.5</version>
405+
<version>3.4.0</version>
406406
</plugin>
407407
</plugins>
408408
</pluginManagement>
@@ -469,6 +469,7 @@
469469
<plugin>
470470
<groupId>org.apache.maven.plugins</groupId>
471471
<artifactId>maven-failsafe-plugin</artifactId>
472+
<version>3.4.0</version>
472473
<configuration>
473474
<redirectTestOutputToFile>true</redirectTestOutputToFile>
474475
</configuration>

0 commit comments

Comments
 (0)