diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml index c63b54bb1d3..542bd647d70 100644 --- a/.github/workflows/build-images.yaml +++ b/.github/workflows/build-images.yaml @@ -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 diff --git a/Dockerfile b/Dockerfile index e40e77b868a..76f7d1216eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -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 +ARG OPENTELEMETRY_JAVA_AGENT_VERSION=1.33.5 RUN curl -LSsO https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v${OPENTELEMETRY_JAVA_AGENT_VERSION}/opentelemetry-javaagent.jar COPY pom.xml . diff --git a/docker-compose.yml b/docker-compose.yml index ab4f15ce68f..9c970b41b09 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: diff --git a/pom.xml b/pom.xml index fdd677c6a77..7c3b00456fb 100644 --- a/pom.xml +++ b/pom.xml @@ -354,14 +354,14 @@ io.micrometer micrometer-core - 1.11.3 + 1.13.3 io.micrometer micrometer-registry-prometheus - 1.11.3 + 1.13.3 @@ -402,7 +402,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.4.0 @@ -469,6 +469,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.4.0 true