Personal-Twin/hapi-fhir-jpaserver-starter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #728 from madduci/rel_7_3_tracking

Browse Source 
Updated Dockerfile and pom.xml
This commit is contained in:
dotasek
2024-08-27 09:09:04 -04:00
committed by GitHub
parent 9c7bd1146e cb3e0ae5a4
commit e2d2ea7726
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-images.yaml vendored
View File

@@ -17,7 +17,7 @@ env:
jobs: jobs:
build: build:
name: Build name: Build
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- name: Container meta for default (distroless) image - name: Container meta for default (distroless) image
id: docker_meta id: docker_meta

2
Dockerfile
View File

@@ -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 WORKDIR /tmp/hapi-fhir-jpaserver-starter
ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.33.3 ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.33.3

2
docker-compose.yml
View File

@@ -12,7 +12,7 @@ services:
ports: ports:
- "8080:8080" - "8080:8080"
hapi-fhir-postgres: hapi-fhir-postgres:
image: postgres:14-alpine image: postgres:15-alpine
container_name: hapi-fhir-postgres container_name: hapi-fhir-postgres
restart: always restart: always
environment: environment:

7
pom.xml
View File

@@ -354,14 +354,14 @@
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-core</artifactId> <artifactId>micrometer-core</artifactId>
<version>1.11.3</version> <version>1.13.3</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus --> <!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-registry-prometheus -->
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId> <artifactId>micrometer-registry-prometheus</artifactId>
<version>1.11.3</version> <version>1.13.3</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -402,7 +402,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version> <version>3.4.0</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
@@ -469,6 +469,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>3.4.0</version>
<configuration> <configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile> <redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration> </configuration>