From 929367fac39af5497d5ec602fbd8d47c7843726f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 00:03:02 +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 | 6 +++--- src/list/Dockerfile | 4 ++-- src/list/frontend/deploy/docker-compose.dev.yml | 8 ++++---- src/list/frontend/tests/e2e/docker-compose.yaml | 6 +++--- 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, 24 insertions(+), 24 deletions(-) diff --git a/docker-compose/docker-compose.probe.yaml b/docker-compose/docker-compose.probe.yaml index 211925e21..b56bd5b8e 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.3.0@sha256:961cf9e2a1939ea380b3f16e313a581b5d4681dd9dc4b1ace060eb396a71df0d + image: docker.io/curlimages/curl:8.4.0@sha256:4a3396ae573c44932d06ba33f8696db4429c419da87cbdc82965ee96a37dd0af 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 d3b0d55fa..e0b84d7ff 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:2392cd9aadfd514b0112186904e7a36fcb6a301fc1e637bab4ad2746877cde96 + image: docker.io/library/traefik:2.10.5@sha256:948978f7ec62f137a79f8af7044a1785bd7868706ef2c8cba9c88db688d08661 restart: unless-stopped ipc: none security_opt: @@ -102,7 +102,7 @@ services: - "traefik.http.routers.ohdsi-atlas.entrypoints=web" fhir: - image: docker.io/hapiproject/hapi:v6.8.0@sha256:b376ef983c54757aff719b17e97301eab43198564d23f2aa9609e9b5f83fa85f + image: docker.io/hapiproject/hapi:v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27 restart: unless-stopped cap_drop: - ALL diff --git a/src/Dockerfile b/src/Dockerfile index e6fa78938..01e4304d5 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/gradle:8.4.0-jdk17@sha256:e7d68f73bf6db644ca5947eb83588c1252d34361b496e90019156581d82ebf0c AS build +FROM docker.io/library/gradle:8.4.0-jdk17@sha256:70da12adf27e83bcc125af9d2bc6f9432590e89c96609625aa688135b27e75fb 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-debian12:nonroot@sha256:340af6ae4c452f0f68b2ea10c78ba42d9fd5faa687ac6b72cc703f849f8080b1 +FROM gcr.io/distroless/java17-debian12:nonroot@sha256:74aa41e4cb8b6cc76391c0679370be6bd75ebf60917a7f9fb5dd1b4c7b1a1854 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 69020ce7f..9c50d0fc1 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:2392cd9aadfd514b0112186904e7a36fcb6a301fc1e637bab4ad2746877cde96 + image: docker.io/library/traefik:2.10.5@sha256:948978f7ec62f137a79f8af7044a1785bd7868706ef2c8cba9c88db688d08661 restart: unless-stopped ipc: none security_opt: @@ -23,7 +23,7 @@ services: memory: 128m fhir: - image: docker.io/hapiproject/hapi:v6.8.0@sha256:b376ef983c54757aff719b17e97301eab43198564d23f2aa9609e9b5f83fa85f + image: docker.io/hapiproject/hapi:v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27 restart: unless-stopped cap_drop: - ALL @@ -270,7 +270,7 @@ services: OTEL_EXPORTER_JAEGER_ENDPOINT: "http://jaeger:14250" jaeger: - image: docker.io/jaegertracing/all-in-one:1.49.0@sha256:0edcea978eb4a631a0d9078f435908852f20013cf5d66908521c5ac2815aeb28 + image: docker.io/jaegertracing/all-in-one:1.50.0@sha256:d589499a01e1e2f9d302db8e210af09688076fd8a93278fa024824a755c1a0f1 ports: - "127.0.0.1:16686:16686" - "127.0.0.1:6831:6831/udp" diff --git a/src/list/Dockerfile b/src/list/Dockerfile index 2b00161df..347c6276b 100644 --- a/src/list/Dockerfile +++ b/src/list/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/node:20.8.0@sha256:6b3f9aa7eefa8d4c93d43914e78aa2bfea9a12808b0059e5da78854dfa8b8768 AS base +FROM docker.io/library/node:20.9.0@sha256:62efd17e997bc843aefa4c003ed84f43dfac83fa6228c57c898482e50a02e45c AS base WORKDIR /app COPY package.json ./ @@ -26,7 +26,7 @@ COPY server/package.json ./server/ RUN npm clean-install --workspace=server COPY server/*.js ./server/ -FROM gcr.io/distroless/nodejs20-debian12:nonroot@sha256:6ac88bf8da1e58af449c9c4ff86ccd20fc062b0f9585e5d53f85fe9657d3f681 +FROM gcr.io/distroless/nodejs20-debian12:nonroot@sha256:5478cbb8b444062e48745de199a1b2607dc9a46669f353e1af25e44a2df92cf6 WORKDIR /app USER 65532:65532 # Port 8081 is currently not used, but exposed to make diff --git a/src/list/frontend/deploy/docker-compose.dev.yml b/src/list/frontend/deploy/docker-compose.dev.yml index 747965b20..74ef170e3 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.8.0@sha256:b376ef983c54757aff719b17e97301eab43198564d23f2aa9609e9b5f83fa85f + image: docker.io/hapiproject/hapi:v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27 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.3.0@sha256:961cf9e2a1939ea380b3f16e313a581b5d4681dd9dc4b1ace060eb396a71df0d + image: docker.io/curlimages/curl:8.4.0@sha256:4a3396ae573c44932d06ba33f8696db4429c419da87cbdc82965ee96a37dd0af 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 && @@ -26,7 +26,7 @@ services: - fhir jaeger: - image: docker.io/jaegertracing/all-in-one:1.49@sha256:0edcea978eb4a631a0d9078f435908852f20013cf5d66908521c5ac2815aeb28 + image: docker.io/jaegertracing/all-in-one:1.50@sha256:d589499a01e1e2f9d302db8e210af09688076fd8a93278fa024824a755c1a0f1 environment: COLLECTOR_OTLP_ENABLED: "true" ports: @@ -51,7 +51,7 @@ services: - 8083:8080 fhir-pseudonymizer: - image: ghcr.io/miracum/fhir-pseudonymizer:v2.21.0@sha256:42a49e389f52f52ea8edad38ea276038681b4a317eca628c58f96894805d6a94 + image: ghcr.io/miracum/fhir-pseudonymizer:v2.21.1@sha256:5aa89bff83b57d7206ec7c70363623ddfcc22936044325e34cc3075499e436ba 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 f7061d1a7..ecb914408 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.8.0@sha256:b376ef983c54757aff719b17e97301eab43198564d23f2aa9609e9b5f83fa85f + image: docker.io/hapiproject/hapi:v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27 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.3.0@sha256:961cf9e2a1939ea380b3f16e313a581b5d4681dd9dc4b1ace060eb396a71df0d + image: docker.io/curlimages/curl:8.4.0@sha256:4a3396ae573c44932d06ba33f8696db4429c419da87cbdc82965ee96a37dd0af 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 && @@ -70,4 +70,4 @@ services: - ${PWD}/frontend/deploy/data/aio-export.json:/tmp/realm.json:ro jaeger: - image: docker.io/jaegertracing/all-in-one:1.49@sha256:0edcea978eb4a631a0d9078f435908852f20013cf5d66908521c5ac2815aeb28 + image: docker.io/jaegertracing/all-in-one:1.50@sha256:d589499a01e1e2f9d302db8e210af09688076fd8a93278fa024824a755c1a0f1 diff --git a/src/notify/tests/e2e/docker-compose.yaml b/src/notify/tests/e2e/docker-compose.yaml index c44e7215c..7e26115cc 100644 --- a/src/notify/tests/e2e/docker-compose.yaml +++ b/src/notify/tests/e2e/docker-compose.yaml @@ -31,7 +31,7 @@ services: POSTGRES_DB: recruit_notify_jobs tester: - image: docker.io/curlimages/curl:8.3.0@sha256:961cf9e2a1939ea380b3f16e313a581b5d4681dd9dc4b1ace060eb396a71df0d + image: docker.io/curlimages/curl:8.4.0@sha256:4a3396ae573c44932d06ba33f8696db4429c419da87cbdc82965ee96a37dd0af command: > -X GET --fail @@ -45,7 +45,7 @@ services: - notify fhir: - image: docker.io/hapiproject/hapi:v6.8.0@sha256:b376ef983c54757aff719b17e97301eab43198564d23f2aa9609e9b5f83fa85f + image: docker.io/hapiproject/hapi:v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27 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 8b42a5e50..848e8d888 100644 --- a/src/query/tests/e2e/Dockerfile +++ b/src/query/tests/e2e/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/python:3.12.0-alpine@sha256:ae35274f417fc81ba6ee1fc84206e8517f28117566ee6a04a64f004c1409bdac +FROM docker.io/library/python:3.12.0-alpine@sha256:a5d1738d6abbdff3e81c10b7f86923ebcb340ca536e21e8c5ee7d938d263dba1 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 2ec6ed73e..40376ae74 100644 --- a/src/query/tests/e2e/docker-compose.yaml +++ b/src/query/tests/e2e/docker-compose.yaml @@ -33,7 +33,7 @@ services: - query fhir: - image: docker.io/hapiproject/hapi:v6.8.0@sha256:b376ef983c54757aff719b17e97301eab43198564d23f2aa9609e9b5f83fa85f + image: docker.io/hapiproject/hapi:v6.8.3@sha256:6195f1116ebabfb0a608addde043b3e524c456c4d4f35b3d25025afd7dcd2e27 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 0ebc28c75..096cd0795 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:9341d0b266b5ad78c69d9d7ce13e0a08f9257602a2d9469c59a2fddf55932f42 AS build +FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy@sha256:6c413812cb79c6a7813129e810c324b2576623585c7fcfbc9784a51671b0eda8 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:ec44f5a31403c0a5b59605809965b8480195c830a2ba1dd2bca38b064dd1a860 AS runtime +FROM mcr.microsoft.com/dotnet/nightly/runtime:7.0-jammy-chiseled@sha256:c1af45414ced858127e2650620c9f895050275a93373c5fff609b43397006119 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.28.2@sha256:0b28a0ae15893822f211bb8501d192c7b52d1920c32e4b43734aa6d94d51477f /opt/bitnami/kubectl/bin/kubectl /usr/bin/kubectl +COPY --from=docker.io/bitnami/kubectl:1.28.3@sha256:1364cda0798b2c44f327265397fbd34a32e66d80328d6e50a2d10377d7e2ff6d /opt/bitnami/kubectl/bin/kubectl /usr/bin/kubectl COPY ./sample-list-bundle.json /tmp/ COPY ./chaos.yaml /tmp/