Skip to content

Commit

Permalink
Merge pull request #728 from madduci/rel_7_3_tracking
Browse files Browse the repository at this point in the history
Updated Dockerfile and pom.xml
  • Loading branch information
dotasek authored Aug 27, 2024
2 parents 9c7bd11 + cb3e0ae commit e2d2ea7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
jobs:
build:
name: Build
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Container meta for default (distroless) image
id: docker_meta
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/maven:3.9.7-eclipse-temurin-17 AS build-hapi
FROM docker.io/library/maven:3.9.9-eclipse-temurin-17 AS build-hapi
WORKDIR /tmp/hapi-fhir-jpaserver-starter

ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.33.3
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
ports:
- "8080:8080"
hapi-fhir-postgres:
image: postgres:14-alpine
image: postgres:15-alpine
container_name: hapi-fhir-postgres
restart: always
environment:
Expand Down
7 changes: 4 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -354,14 +354,14 @@
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId>
<version>1.11.3</version>
<version>1.13.3</version>
</dependency>

<!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus -->
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<version>1.11.3</version>
<version>1.13.3</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -402,7 +402,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<version>3.4.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -469,6 +469,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.4.0</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
Expand Down

0 comments on commit e2d2ea7

Please sign in to comment.