Merge pull request #728 from madduci/rel_7_3_tracking
Updated Dockerfile and pom.xml
This commit is contained in:
2
.github/workflows/build-images.yaml
vendored
2
.github/workflows/build-images.yaml
vendored
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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:
|
||||
|
||||
7
pom.xml
7
pom.xml
@@ -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>
|
||||
@@ -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>
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user