Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/renovate/container-images' into …
Browse files Browse the repository at this point in the history
…ci-refactoring-and-renovations
  • Loading branch information
chgl committed Sep 8, 2023
2 parents 6276b7f + bf7b69e commit 3afae40
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion docker-compose/docker-compose.probe.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
health-probes:
image: docker.io/curlimages/curl:8.1.1@sha256:5af13420d29b7aa7007419347519984ce44778aaf89c475c25edc9b48ca125b2
image: docker.io/curlimages/curl:8.2.1@sha256:bb0843a1307b1aa73f65f24379d11dde881c16db62ba50810de0c64d48e740ed
ipc: private
security_opt:
- "no-new-privileges:true"
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/docker-compose.staging.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
traefik:
image: docker.io/library/traefik:v2.10.1@sha256:7347d4d189642064337fe4eb615d14de2d44f287cb7e1189752fb7399a5ad843
image: docker.io/library/traefik:2.10.4@sha256:429f3398a3cd1aa7436aa4f59d809040d3903506a9d83bee61688bb1429c7693
restart: unless-stopped
ipc: none
security_opt:
Expand Down Expand Up @@ -151,7 +151,7 @@ services:
POSTGRES_DB: fhir

maildev:
image: docker.io/maildev/maildev:2.0.5@sha256:082ec5ee92266c6e17493998ff1bf1c3eb70604b159fbeeaa435ee777f5cc953
image: docker.io/maildev/maildev:2.1.0@sha256:f7429227b8f471b3fe761767d86a8794a2fc7488bccdcda46ea6d5ba5c2c7bf5
restart: unless-stopped
ipc: none
security_opt:
Expand Down
4 changes: 2 additions & 2 deletions src/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/gradle:8.1.1-jdk17@sha256:e7a4bc8f4ee27feae2eac4de61ca64406b7137e6f6b107052accd24bf0806043 AS build
FROM docker.io/library/gradle:8.3.0-jdk17@sha256:5f4ab273b15961c5f22969136ea884ca0343f1d8b2df5c4c6fe0ca8939b401b1 AS build
WORKDIR /home/gradle/src
ENV GRADLE_USER_HOME="/gradle"

Expand All @@ -24,7 +24,7 @@ ENV TZ="UTC"
RUN gradle ":${MODULE_NAME}:test" && \
gradle jacocoTestReport

FROM gcr.io/distroless/java17-debian11:nonroot@sha256:61463fa9d1bb9994de4e50e71f3e487d0e61f1676e26306388a743ff96311777
FROM gcr.io/distroless/java17-debian11:nonroot@sha256:41af86bc38476afb89e640959585e4fc81104bd9c56303c24b749cc3644b79a8
WORKDIR /app

COPY --from=build /home/gradle/src/opentelemetry-javaagent.jar ./opentelemetry-javaagent.jar
Expand Down
10 changes: 5 additions & 5 deletions src/hack/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
traefik:
image: docker.io/library/traefik:v2.10.1@sha256:7347d4d189642064337fe4eb615d14de2d44f287cb7e1189752fb7399a5ad843
image: docker.io/library/traefik:2.10.4@sha256:429f3398a3cd1aa7436aa4f59d809040d3903506a9d83bee61688bb1429c7693
restart: unless-stopped
ipc: none
security_opt:
Expand Down Expand Up @@ -78,7 +78,7 @@ services:
POSTGRES_DB: fhir

broadsea-atlasdb:
image: docker.io/ohdsi/broadsea-atlasdb:2.0.0@sha256:da28ed2179efe4f74f5d30da14b348b20acd792e90518e452f37748e89aec179
image: docker.io/ohdsi/broadsea-atlasdb:2.1.0@sha256:99b4bd5515b3d82adb5bac9b14558b434df55fced6c194c965e3fb1371cb36c5
ports:
- "127.0.0.1:25432:5432"

Expand Down Expand Up @@ -269,7 +269,7 @@ services:
OTEL_EXPORTER_JAEGER_ENDPOINT: "http://jaeger:14250"

jaeger:
image: docker.io/jaegertracing/all-in-one:1.45.0@sha256:5d5c9d2d8c8cbb42f1db4aac1f1f8487bac63da6802004d0da8580fc0c7311a1
image: docker.io/jaegertracing/all-in-one:1.49.0@sha256:0edcea978eb4a631a0d9078f435908852f20013cf5d66908521c5ac2815aeb28
ports:
- "127.0.0.1:16686:16686"
- "127.0.0.1:6831:6831/udp"
Expand All @@ -282,7 +282,7 @@ services:
- "traefik.http.routers.jaeger.entrypoints=web"

maildev:
image: docker.io/maildev/maildev:2.0.5@sha256:082ec5ee92266c6e17493998ff1bf1c3eb70604b159fbeeaa435ee777f5cc953
image: docker.io/maildev/maildev:2.1.0@sha256:f7429227b8f471b3fe761767d86a8794a2fc7488bccdcda46ea6d5ba5c2c7bf5
restart: unless-stopped
ipc: none
security_opt:
Expand Down Expand Up @@ -324,7 +324,7 @@ services:
- "127.0.0.1:6432:5432"

keycloak:
image: quay.io/keycloak/keycloak:21.1.1@sha256:8ebb3930c41e8a066c4246eaf351ac09cdc984e11b1f607d6ff4ce10d69dc808
image: quay.io/keycloak/keycloak:21.1.2@sha256:3408c186dde4a95c2b99ef1290721bf1d253d64ba3a1de0a46c667b8288051f0
restart: unless-stopped
ipc: none
security_opt:
Expand Down
2 changes: 1 addition & 1 deletion src/list/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/node:18.16.0@sha256:8cdf7234449f35e579f7491137807ddb3a089f028862f7ab69af437cc9f47ff1 AS base
FROM docker.io/library/node:18.17.1@sha256:933bcfad91e9052a02bc29eb5aa29033e542afac4174f9524b79066d97b23c24 AS base
WORKDIR /app

COPY package.json ./
Expand Down
6 changes: 3 additions & 3 deletions src/list/frontend/deploy/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
- 8082:8080

loader:
image: docker.io/curlimages/curl:8.1.1@sha256:5af13420d29b7aa7007419347519984ce44778aaf89c475c25edc9b48ca125b2
image: docker.io/curlimages/curl:8.2.1@sha256:bb0843a1307b1aa73f65f24379d11dde881c16db62ba50810de0c64d48e740ed
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 &&
Expand All @@ -26,7 +26,7 @@ services:
- fhir

jaeger:
image: docker.io/jaegertracing/all-in-one:1.45@sha256:5d5c9d2d8c8cbb42f1db4aac1f1f8487bac63da6802004d0da8580fc0c7311a1
image: docker.io/jaegertracing/all-in-one:1.49@sha256:0edcea978eb4a631a0d9078f435908852f20013cf5d66908521c5ac2815aeb28
environment:
COLLECTOR_OTLP_ENABLED: "true"
ports:
Expand All @@ -50,7 +50,7 @@ services:
- 8083:8080

fhir-pseudonymizer:
image: ghcr.io/miracum/fhir-pseudonymizer:v2.17.0@sha256:431a7f4516c1f641966c507941b87a997441665656572a1c00c44376ef08fe24
image: ghcr.io/miracum/fhir-pseudonymizer:v2.20.0@sha256:8128ddc10f3abfcd59a32e2f90ddfa622b58ac6bda95182d056aa0c98411efa2
environment:
APIKEY: "fhir-pseudonymizer-api-key"
TRACING__ENABLED: "true"
Expand Down
2 changes: 1 addition & 1 deletion src/list/frontend/tests/e2e/cypress.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/cypress/included:12.13.0@sha256:bb18d50ddaad4c846c432ee5e6b83bbf239cfe8454d52b546dc2ceb57d4b60af
FROM docker.io/cypress/included:12.17.4@sha256:102b34b9e4cb9895c44a74293c6931e7282535775045dd8b1c7608667a34c4b6
WORKDIR /root
ENV CI=1

Expand Down
4 changes: 2 additions & 2 deletions src/list/frontend/tests/e2e/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ services:
HAPI_FHIR_CORS_ALLOWED_ORIGIN: "http://list:8080"

loader:
image: docker.io/curlimages/curl:8.1.1@sha256:5af13420d29b7aa7007419347519984ce44778aaf89c475c25edc9b48ca125b2
image: docker.io/curlimages/curl:8.2.1@sha256:bb0843a1307b1aa73f65f24379d11dde881c16db62ba50810de0c64d48e740ed
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 &&
Expand All @@ -69,4 +69,4 @@ services:
- ${PWD}/frontend/deploy/data/aio-export.json:/tmp/realm.json:ro

jaeger:
image: docker.io/jaegertracing/all-in-one:1.45@sha256:5d5c9d2d8c8cbb42f1db4aac1f1f8487bac63da6802004d0da8580fc0c7311a1
image: docker.io/jaegertracing/all-in-one:1.49@sha256:0edcea978eb4a631a0d9078f435908852f20013cf5d66908521c5ac2815aeb28
4 changes: 2 additions & 2 deletions src/notify/tests/e2e/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ services:
POSTGRES_DB: recruit_notify_jobs

tester:
image: docker.io/curlimages/curl:8.1.1@sha256:5af13420d29b7aa7007419347519984ce44778aaf89c475c25edc9b48ca125b2
image: docker.io/curlimages/curl:8.2.1@sha256:bb0843a1307b1aa73f65f24379d11dde881c16db62ba50810de0c64d48e740ed
command: >
-X GET
--fail
Expand All @@ -51,4 +51,4 @@ services:
HAPI_FHIR_CORS_ALLOWED_ORIGIN: "*"

maildev:
image: docker.io/maildev/maildev:2.0.5@sha256:082ec5ee92266c6e17493998ff1bf1c3eb70604b159fbeeaa435ee777f5cc953
image: docker.io/maildev/maildev:2.1.0@sha256:f7429227b8f471b3fe761767d86a8794a2fc7488bccdcda46ea6d5ba5c2c7bf5
2 changes: 1 addition & 1 deletion src/query/tests/e2e/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/python:3.11.3-alpine@sha256:4e8e9a59bf1b3ca8e030244bc5f801f23e41e37971907371da21191312087a07
FROM docker.io/library/python:3.11.5-alpine@sha256:5d769f990397afbb2aca24b0655e404c0f2806d268f454b052e81e39d87abf42
WORKDIR /opt/tests

COPY requirements.txt .
Expand Down
2 changes: 1 addition & 1 deletion src/query/tests/e2e/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ services:
HAPI_FHIR_NARRATIVE_ENABLED: "false"

broadsea-atlasdb:
image: docker.io/ohdsi/broadsea-atlasdb:2.0.0@sha256:da28ed2179efe4f74f5d30da14b348b20acd792e90518e452f37748e89aec179
image: docker.io/ohdsi/broadsea-atlasdb:2.1.0@sha256:99b4bd5515b3d82adb5bac9b14558b434df55fced6c194c965e3fb1371cb36c5

ohdsi-webapi:
image: docker.io/ohdsi/webapi:2.13.0@sha256:04313754fc79a6e362a8116ef462360e3891581a045924f4ec5ed404fbb9b837
Expand Down
6 changes: 3 additions & 3 deletions tests/chaos/tester/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.4
FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy@sha256:d2a0f255365a16fab863424a74ebbbcb0e033142268ceda8083eb37b2f02a3a1 AS build
FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy@sha256:fff616cce9131105bd3a09bd7033e8604ac761490a703c5ece071751c155b218 AS build
WORKDIR /build
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1

Expand All @@ -21,13 +21,13 @@ dotnet publish tester.csproj \
-o /build/publish
EOF

FROM mcr.microsoft.com/dotnet/nightly/runtime:7.0-jammy-chiseled@sha256:a3455b37de54bdd46f60984c06f34883fdc3a8add5584eb0da83aaa729a97920 AS runtime
FROM mcr.microsoft.com/dotnet/nightly/runtime:7.0-jammy-chiseled@sha256:a91b1132db1cb6310e8e68e7ba513be5ac96234446461eb4de2439856dd84fa5 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.2@sha256:f84620143febefe8823d52554b32fd76b4e34d4f9a0f9d2df7648bc752a3d602 /opt/bitnami/kubectl/bin/kubectl /usr/bin/kubectl
COPY --from=docker.io/bitnami/kubectl:1.27.5@sha256:de14320baddeead24f572b10b18df7dd66315ebc9b88f015d392f1c466b46211 /opt/bitnami/kubectl/bin/kubectl /usr/bin/kubectl

COPY ./sample-list-bundle.json /tmp/
COPY ./chaos.yaml /tmp/
Expand Down

0 comments on commit 3afae40

Please sign in to comment.