From cf35d99b7d1076680f70fc627a2e0ab14b8b6eac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 21:13:59 +0000 Subject: [PATCH] chore(deps): update container-images --- docker-compose/docker-compose.probe.yaml | 2 +- docker-compose/docker-compose.staging.yaml | 4 ++-- src/Dockerfile | 4 ++-- src/hack/docker-compose.yaml | 4 ++-- src/list/Dockerfile | 2 +- src/list/frontend/deploy/docker-compose.dev.yml | 6 +++--- src/list/frontend/tests/e2e/docker-compose.yaml | 4 ++-- src/notify/tests/e2e/docker-compose.yaml | 4 ++-- src/query/tests/e2e/Dockerfile | 2 +- src/query/tests/e2e/docker-compose.yaml | 2 +- tests/chaos/tester/Dockerfile | 6 +++--- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docker-compose/docker-compose.probe.yaml b/docker-compose/docker-compose.probe.yaml index 375386ec6..211925e21 100644 --- a/docker-compose/docker-compose.probe.yaml +++ b/docker-compose/docker-compose.probe.yaml @@ -1,6 +1,6 @@ services: health-probes: - image: docker.io/curlimages/curl:8.2.1@sha256:bb0843a1307b1aa73f65f24379d11dde881c16db62ba50810de0c64d48e740ed + image: docker.io/curlimages/curl:8.3.0@sha256:961cf9e2a1939ea380b3f16e313a581b5d4681dd9dc4b1ace060eb396a71df0d ipc: private security_opt: - "no-new-privileges:true" diff --git a/docker-compose/docker-compose.staging.yaml b/docker-compose/docker-compose.staging.yaml index 8a6a7094b..621a580d2 100644 --- a/docker-compose/docker-compose.staging.yaml +++ b/docker-compose/docker-compose.staging.yaml @@ -1,6 +1,6 @@ services: traefik: - image: docker.io/library/traefik:2.10.4@sha256:429f3398a3cd1aa7436aa4f59d809040d3903506a9d83bee61688bb1429c7693 + image: docker.io/library/traefik:2.10.4@sha256:2392cd9aadfd514b0112186904e7a36fcb6a301fc1e637bab4ad2746877cde96 restart: unless-stopped ipc: none security_opt: @@ -99,7 +99,7 @@ services: - "traefik.http.routers.ohdsi-atlas.entrypoints=web" fhir: - image: docker.io/hapiproject/hapi:v6.6.0@sha256:c00367865ae5dad4e171cbb68bfc1c39818854079d1565bee4c86a45e78335d0 + image: docker.io/hapiproject/hapi:v6.8.0@sha256:b376ef983c54757aff719b17e97301eab43198564d23f2aa9609e9b5f83fa85f restart: unless-stopped cap_drop: - ALL diff --git a/src/Dockerfile b/src/Dockerfile index 8bdee6eb4..f67c7fc3b 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/gradle:8.3.0-jdk17@sha256:5f4ab273b15961c5f22969136ea884ca0343f1d8b2df5c4c6fe0ca8939b401b1 AS build +FROM docker.io/library/gradle:8.3.0-jdk17@sha256:461018d754af5e85ca08b8f38e5f583d65ebadf83be8ad01f3bff03740ccef4f AS build WORKDIR /home/gradle/src ENV GRADLE_USER_HOME="/gradle" @@ -24,7 +24,7 @@ ENV TZ="UTC" RUN gradle ":${MODULE_NAME}:test" && \ gradle jacocoTestReport -FROM gcr.io/distroless/java17-debian11:nonroot@sha256:41af86bc38476afb89e640959585e4fc81104bd9c56303c24b749cc3644b79a8 +FROM gcr.io/distroless/java17-debian11:nonroot@sha256:6e9c1615972eaef182a0bc6cca02fbbf62ad6e160118461616ed1a688c3823ea WORKDIR /app COPY --from=build /home/gradle/src/opentelemetry-javaagent.jar ./opentelemetry-javaagent.jar diff --git a/src/hack/docker-compose.yaml b/src/hack/docker-compose.yaml index d731dc961..460862510 100644 --- a/src/hack/docker-compose.yaml +++ b/src/hack/docker-compose.yaml @@ -1,6 +1,6 @@ services: traefik: - image: docker.io/library/traefik:2.10.4@sha256:429f3398a3cd1aa7436aa4f59d809040d3903506a9d83bee61688bb1429c7693 + image: docker.io/library/traefik:2.10.4@sha256:2392cd9aadfd514b0112186904e7a36fcb6a301fc1e637bab4ad2746877cde96 restart: unless-stopped ipc: none security_opt: @@ -22,7 +22,7 @@ services: memory: 128m fhir: - image: docker.io/hapiproject/hapi:v6.6.0@sha256:c00367865ae5dad4e171cbb68bfc1c39818854079d1565bee4c86a45e78335d0 + image: docker.io/hapiproject/hapi:v6.8.0@sha256:b376ef983c54757aff719b17e97301eab43198564d23f2aa9609e9b5f83fa85f restart: unless-stopped cap_drop: - ALL diff --git a/src/list/Dockerfile b/src/list/Dockerfile index dd691df8f..c597b235b 100644 --- a/src/list/Dockerfile +++ b/src/list/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/node:18.17.1@sha256:933bcfad91e9052a02bc29eb5aa29033e542afac4174f9524b79066d97b23c24 AS base +FROM docker.io/library/node:18.18.0@sha256:ee0a21d64211d92d4340b225c556e9ef1a8bce1d5b03b49f5f07bf1dbbaa5626 AS base WORKDIR /app COPY package.json ./ diff --git a/src/list/frontend/deploy/docker-compose.dev.yml b/src/list/frontend/deploy/docker-compose.dev.yml index ad9759c7c..72cb9c19d 100644 --- a/src/list/frontend/deploy/docker-compose.dev.yml +++ b/src/list/frontend/deploy/docker-compose.dev.yml @@ -2,7 +2,7 @@ version: "3.9" services: fhir: - image: docker.io/hapiproject/hapi:v6.6.0@sha256:c00367865ae5dad4e171cbb68bfc1c39818854079d1565bee4c86a45e78335d0 + image: docker.io/hapiproject/hapi:v6.8.0@sha256:b376ef983c54757aff719b17e97301eab43198564d23f2aa9609e9b5f83fa85f environment: HAPI_FHIR_VALIDATION_REQUESTS_ENABLED: "true" HAPI_FHIR_SUBSCRIPTION_RESTHOOK_ENABLED: "true" @@ -14,7 +14,7 @@ services: - 8082:8080 loader: - image: docker.io/curlimages/curl:8.2.1@sha256:bb0843a1307b1aa73f65f24379d11dde881c16db62ba50810de0c64d48e740ed + image: docker.io/curlimages/curl:8.3.0@sha256:961cf9e2a1939ea380b3f16e313a581b5d4681dd9dc4b1ace060eb396a71df0d command: > sh -c "curl -X POST -H 'Content-Type:application/fhir+json' --retry-connrefuse --connect-timeout 30 --max-time 60 --retry 5 --retry-delay 15 --data '@/data/sample-record-1.json' http://fhir:8080/fhir && curl -X POST -H 'Content-Type:application/fhir+json' --retry-connrefuse --connect-timeout 30 --max-time 60 --retry 5 --retry-delay 15 --data '@/data/sample-record-2.json' http://fhir:8080/fhir && @@ -50,7 +50,7 @@ services: - 8083:8080 fhir-pseudonymizer: - image: ghcr.io/miracum/fhir-pseudonymizer:v2.20.0@sha256:8128ddc10f3abfcd59a32e2f90ddfa622b58ac6bda95182d056aa0c98411efa2 + image: ghcr.io/miracum/fhir-pseudonymizer:v2.20.2@sha256:353781f2fa9b041214e9d2887a5ed3e727c30dc7fd30270a05199ba536009d15 environment: APIKEY: "fhir-pseudonymizer-api-key" TRACING__ENABLED: "true" diff --git a/src/list/frontend/tests/e2e/docker-compose.yaml b/src/list/frontend/tests/e2e/docker-compose.yaml index 2e91536ee..2d5050495 100644 --- a/src/list/frontend/tests/e2e/docker-compose.yaml +++ b/src/list/frontend/tests/e2e/docker-compose.yaml @@ -34,7 +34,7 @@ services: - ${PWD}/frontend:/root/e2e fhir: - image: docker.io/hapiproject/hapi:v6.6.0@sha256:c00367865ae5dad4e171cbb68bfc1c39818854079d1565bee4c86a45e78335d0 + image: docker.io/hapiproject/hapi:v6.8.0@sha256:b376ef983c54757aff719b17e97301eab43198564d23f2aa9609e9b5f83fa85f environment: HAPI_FHIR_VALIDATION_REQUESTS_ENABLED: "true" HAPI_FHIR_SUBSCRIPTION_RESTHOOK_ENABLED: "true" @@ -42,7 +42,7 @@ services: HAPI_FHIR_CORS_ALLOWED_ORIGIN: "http://list:8080" loader: - image: docker.io/curlimages/curl:8.2.1@sha256:bb0843a1307b1aa73f65f24379d11dde881c16db62ba50810de0c64d48e740ed + image: docker.io/curlimages/curl:8.3.0@sha256:961cf9e2a1939ea380b3f16e313a581b5d4681dd9dc4b1ace060eb396a71df0d command: > sh -c "curl -X POST -H 'Content-Type: application/fhir+json' --retry-connrefuse --connect-timeout 30 --max-time 60 --retry 10 --retry-delay 15 --data '@/data/sample-record-1.json' http://fhir:8080/fhir && curl -X POST -H 'Content-Type: application/fhir+json' --retry-connrefuse --connect-timeout 30 --max-time 60 --retry 10 --retry-delay 15 --data '@/data/sample-record-2.json' http://fhir:8080/fhir && diff --git a/src/notify/tests/e2e/docker-compose.yaml b/src/notify/tests/e2e/docker-compose.yaml index 781c4e347..ed1112789 100644 --- a/src/notify/tests/e2e/docker-compose.yaml +++ b/src/notify/tests/e2e/docker-compose.yaml @@ -28,7 +28,7 @@ services: POSTGRES_DB: recruit_notify_jobs tester: - image: docker.io/curlimages/curl:8.2.1@sha256:bb0843a1307b1aa73f65f24379d11dde881c16db62ba50810de0c64d48e740ed + image: docker.io/curlimages/curl:8.3.0@sha256:961cf9e2a1939ea380b3f16e313a581b5d4681dd9dc4b1ace060eb396a71df0d command: > -X GET --fail @@ -42,7 +42,7 @@ services: - notify fhir: - image: docker.io/hapiproject/hapi:v6.6.0@sha256:c00367865ae5dad4e171cbb68bfc1c39818854079d1565bee4c86a45e78335d0 + image: docker.io/hapiproject/hapi:v6.8.0@sha256:b376ef983c54757aff719b17e97301eab43198564d23f2aa9609e9b5f83fa85f environment: HAPI_FHIR_VALIDATION_REQUESTS_ENABLED: "true" HAPI_FHIR_SUBSCRIPTION_RESTHOOK_ENABLED: "true" diff --git a/src/query/tests/e2e/Dockerfile b/src/query/tests/e2e/Dockerfile index 72c85dc03..8b42a5e50 100644 --- a/src/query/tests/e2e/Dockerfile +++ b/src/query/tests/e2e/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/python:3.11.5-alpine@sha256:5d769f990397afbb2aca24b0655e404c0f2806d268f454b052e81e39d87abf42 +FROM docker.io/library/python:3.12.0-alpine@sha256:ae35274f417fc81ba6ee1fc84206e8517f28117566ee6a04a64f004c1409bdac WORKDIR /opt/tests COPY requirements.txt . diff --git a/src/query/tests/e2e/docker-compose.yaml b/src/query/tests/e2e/docker-compose.yaml index 676722dc4..bd15f6464 100644 --- a/src/query/tests/e2e/docker-compose.yaml +++ b/src/query/tests/e2e/docker-compose.yaml @@ -31,7 +31,7 @@ services: - query fhir: - image: docker.io/hapiproject/hapi:v6.6.0@sha256:c00367865ae5dad4e171cbb68bfc1c39818854079d1565bee4c86a45e78335d0 + image: docker.io/hapiproject/hapi:v6.8.0@sha256:b376ef983c54757aff719b17e97301eab43198564d23f2aa9609e9b5f83fa85f environment: HAPI_FHIR_VALIDATION_REQUESTS_ENABLED: "true" HAPI_FHIR_SUBSCRIPTION_RESTHOOK_ENABLED: "true" diff --git a/tests/chaos/tester/Dockerfile b/tests/chaos/tester/Dockerfile index 4d2358302..0f3aeeabe 100644 --- a/tests/chaos/tester/Dockerfile +++ b/tests/chaos/tester/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.4 -FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy@sha256:fff616cce9131105bd3a09bd7033e8604ac761490a703c5ece071751c155b218 AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy@sha256:49f2cb277dc4b089d9d7642f06afae0f2da10224be55ea2a64eb8af798ec4994 AS build WORKDIR /build ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 @@ -21,13 +21,13 @@ dotnet publish tester.csproj \ -o /build/publish EOF -FROM mcr.microsoft.com/dotnet/nightly/runtime:7.0-jammy-chiseled@sha256:a91b1132db1cb6310e8e68e7ba513be5ac96234446461eb4de2439856dd84fa5 AS runtime +FROM mcr.microsoft.com/dotnet/nightly/runtime:7.0-jammy-chiseled@sha256:ec44f5a31403c0a5b59605809965b8480195c830a2ba1dd2bca38b064dd1a860 AS runtime WORKDIR /opt/chaos-tester USER 65532:65532 ENV DOTNET_ENVIRONMENT="Production" \ DOTNET_CLI_TELEMETRY_OPTOUT=1 -COPY --from=docker.io/bitnami/kubectl:1.27.5@sha256:d7dfaa5268288fdf90f0ef91d48e2ecf8051923b472736c3344ada202aa0b0b0 /opt/bitnami/kubectl/bin/kubectl /usr/bin/kubectl +COPY --from=docker.io/bitnami/kubectl:1.28.2@sha256:0b28a0ae15893822f211bb8501d192c7b52d1920c32e4b43734aa6d94d51477f /opt/bitnami/kubectl/bin/kubectl /usr/bin/kubectl COPY ./sample-list-bundle.json /tmp/ COPY ./chaos.yaml /tmp/