From 71283e4c3239140abb2e7cb14af5ba678822b753 Mon Sep 17 00:00:00 2001 From: Alexandre Dutra Date: Mon, 3 Jun 2024 12:28:08 +0200 Subject: [PATCH] Do not pin digests for Dockerfiles and docker-compose files (#8689) --- .github/renovate.json5 | 5 ++--- .../client/auth/oauth2/Dockerfile-authelia-version | 2 +- .../client/auth/oauth2/Dockerfile-keycloak-version | 2 +- .../org/projectnessie/model/Dockerfile-redocly-version | 2 +- .../nessie/cli/commands/Dockerfile-keycloak-version | 2 +- docker/authn-authelia/docker-compose.yml | 4 ++-- docker/authn-keycloak/docker-compose.yml | 4 ++-- docker/catalog-auth-s3-otel-jdbc/docker-compose.yml | 10 +++++----- docker/catalog-auth-s3-otel/docker-compose.yml | 8 ++++---- docker/dynamodb/docker-compose.yml | 4 ++-- docker/in_memory/docker-compose.yml | 2 +- docker/mongodb/docker-compose.yml | 4 ++-- docker/telemetry/docker-compose.yml | 4 ++-- .../gc/contents/jdbc/Dockerfile-mariadb-version | 2 +- .../gc/contents/jdbc/Dockerfile-mysql-version | 2 +- .../gc/contents/jdbc/Dockerfile-postgres-version | 2 +- .../testing/azurite/Dockerfile-azurite-version | 2 +- .../testing/gcs/Dockerfile-fake-gcs-server-version | 2 +- .../testing/keycloak/Dockerfile-keycloak-version | 2 +- .../org/projectnessie/minio/Dockerfile-minio-version | 2 +- .../testing/nessie/Dockerfile-nessie-version | 2 +- tools/dockerbuild/docker/Dockerfile-admintool | 2 +- tools/dockerbuild/docker/Dockerfile-gctool | 2 +- tools/dockerbuild/docker/Dockerfile-server | 2 +- .../bigtabletests/Dockerfile-google-cloud-sdk-version | 2 +- .../cassandratests/Dockerfile-cassandra-version | 2 +- .../storage/cassandratests/Dockerfile-scylladb-version | 2 +- .../dynamodbtests/Dockerfile-dynamodb-local-version | 2 +- .../storage/jdbctests/Dockerfile-cockroach-version | 2 +- .../storage/jdbctests/Dockerfile-mariadb-version | 2 +- .../storage/jdbctests/Dockerfile-mysql-version | 2 +- .../storage/jdbctests/Dockerfile-postgres-version | 2 +- .../storage/mongodbtests/Dockerfile-mongodb-version | 2 +- 33 files changed, 46 insertions(+), 47 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index dbb348dc78a..1207ca6dece 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -5,7 +5,6 @@ // Required to not pin dependencies to _exact_ versions (pip) ":preserveSemverRanges", "group:monorepos", - "docker:pinDigests", "helpers:pinGitHubActionDigests", ":semanticPrefixFixDepsChoreOthers", ":dependencyDashboard", @@ -27,7 +26,7 @@ // Dockerfile for google-cloud-cli, basically no minor/patch version, daily major version updates { matchManagers: ["dockerfile", "devcontainer", "docker-compose"], - matchUpdateTypes: ["major", "minor", "patch", "digest"], + matchUpdateTypes: ["major", "minor", "patch"], matchPackageNames: [ "gcr.io/google.com/cloudsdktool/google-cloud-cli" ], @@ -38,7 +37,7 @@ // Check for updates, merge automatically { matchManagers: ["maven", "gradle", "gradle-wrapper", "pip_requirements", "pip_setup", "dockerfile", "devcontainer", "docker-compose"], - matchUpdateTypes: ["minor", "patch", "pin", "pinDigest", "digest"], + matchUpdateTypes: ["minor", "patch"], automerge: true, platformAutomerge: true, }, diff --git a/api/client/src/intTest/resources/org/projectnessie/client/auth/oauth2/Dockerfile-authelia-version b/api/client/src/intTest/resources/org/projectnessie/client/auth/oauth2/Dockerfile-authelia-version index 413343f565e..bf438b3196d 100644 --- a/api/client/src/intTest/resources/org/projectnessie/client/auth/oauth2/Dockerfile-authelia-version +++ b/api/client/src/intTest/resources/org/projectnessie/client/auth/oauth2/Dockerfile-authelia-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM authelia/authelia:4.38@sha256:19375b10024caeef4e0b119a6247beae84cbaa02c846cfd750e92dea910d4b6a +FROM authelia/authelia:4.38 diff --git a/api/client/src/intTest/resources/org/projectnessie/client/auth/oauth2/Dockerfile-keycloak-version b/api/client/src/intTest/resources/org/projectnessie/client/auth/oauth2/Dockerfile-keycloak-version index a9c801dc30b..f1ae5c40f86 100644 --- a/api/client/src/intTest/resources/org/projectnessie/client/auth/oauth2/Dockerfile-keycloak-version +++ b/api/client/src/intTest/resources/org/projectnessie/client/auth/oauth2/Dockerfile-keycloak-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM quay.io/keycloak/keycloak:24.0.4@sha256:ff02c932f0249c58f32b8ff1b188a48cc90809779a3a05931ab67f5672400ad0 +FROM quay.io/keycloak/keycloak:24.0.4 diff --git a/api/model/src/intTest/resources/org/projectnessie/model/Dockerfile-redocly-version b/api/model/src/intTest/resources/org/projectnessie/model/Dockerfile-redocly-version index eefddf6ae0a..171434bfbdf 100644 --- a/api/model/src/intTest/resources/org/projectnessie/model/Dockerfile-redocly-version +++ b/api/model/src/intTest/resources/org/projectnessie/model/Dockerfile-redocly-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM docker.io/redocly/cli:1.14.0@sha256:fcdcfd8cb8794bac7a7fb2518d583f33e6909f374785c64a6cbb38b7aa1be410 +FROM docker.io/redocly/cli:1.14.0 diff --git a/cli/cli/src/intTest/resources/org/projectnessie/nessie/cli/commands/Dockerfile-keycloak-version b/cli/cli/src/intTest/resources/org/projectnessie/nessie/cli/commands/Dockerfile-keycloak-version index a9c801dc30b..f1ae5c40f86 100644 --- a/cli/cli/src/intTest/resources/org/projectnessie/nessie/cli/commands/Dockerfile-keycloak-version +++ b/cli/cli/src/intTest/resources/org/projectnessie/nessie/cli/commands/Dockerfile-keycloak-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM quay.io/keycloak/keycloak:24.0.4@sha256:ff02c932f0249c58f32b8ff1b188a48cc90809779a3a05931ab67f5672400ad0 +FROM quay.io/keycloak/keycloak:24.0.4 diff --git a/docker/authn-authelia/docker-compose.yml b/docker/authn-authelia/docker-compose.yml index ce449da7b3f..a565d5f5387 100644 --- a/docker/authn-authelia/docker-compose.yml +++ b/docker/authn-authelia/docker-compose.yml @@ -24,7 +24,7 @@ version: '3' services: nessie: - image: ghcr.io/projectnessie/nessie:latest@sha256:7fc6cfe427db95f660f9676e10c30c5c21a91d48bf37b2ec52abb646d246b34d + image: ghcr.io/projectnessie/nessie:latest ports: - "19120:19120" depends_on: @@ -45,7 +45,7 @@ services: retries: 15 authelia: - image: authelia/authelia:4.38@sha256:19375b10024caeef4e0b119a6247beae84cbaa02c846cfd750e92dea910d4b6a + image: authelia/authelia:4.38 ports: - "9091:9091" volumes: diff --git a/docker/authn-keycloak/docker-compose.yml b/docker/authn-keycloak/docker-compose.yml index e80008cc085..4859d7078b9 100644 --- a/docker/authn-keycloak/docker-compose.yml +++ b/docker/authn-keycloak/docker-compose.yml @@ -24,7 +24,7 @@ version: '3' services: nessie: - image: ghcr.io/projectnessie/nessie:latest@sha256:7fc6cfe427db95f660f9676e10c30c5c21a91d48bf37b2ec52abb646d246b34d + image: ghcr.io/projectnessie/nessie:latest ports: - "19120:19120" depends_on: @@ -43,7 +43,7 @@ services: retries: 15 keycloak: - image: quay.io/keycloak/keycloak:24.0.4@sha256:ff02c932f0249c58f32b8ff1b188a48cc90809779a3a05931ab67f5672400ad0 + image: quay.io/keycloak/keycloak:24.0.4 ports: - "8080:8080" environment: diff --git a/docker/catalog-auth-s3-otel-jdbc/docker-compose.yml b/docker/catalog-auth-s3-otel-jdbc/docker-compose.yml index 13ec4c498d4..38463632e3c 100644 --- a/docker/catalog-auth-s3-otel-jdbc/docker-compose.yml +++ b/docker/catalog-auth-s3-otel-jdbc/docker-compose.yml @@ -92,7 +92,7 @@ services: # Jaeger (OpenTelemetry traces collector) jaeger: - image: docker.io/jaegertracing/all-in-one:latest@sha256:177998a612bd025a5ed80d020392ff51fdfae586df58fc8970e419266e1bd7a8 + image: docker.io/jaegertracing/all-in-one:latest ports: # Jaeger gRPC collector, used by Nessie - "4317:4317" @@ -108,7 +108,7 @@ services: # MinIO minio: - image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z@sha256:7cb3f11447d1ac7c4b73420dd8f3601afa16ea0cd7e929ecb00be1a8af1eac05 + image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z ports: # API port, used by Nessie - "9000:9000" @@ -128,7 +128,7 @@ services: # Create MinIO bucket minio-setup: - image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z@sha256:7cb3f11447d1ac7c4b73420dd8f3601afa16ea0cd7e929ecb00be1a8af1eac05 + image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z depends_on: minio: condition: service_healthy @@ -151,7 +151,7 @@ services: # curl http://127.0.0.1:8080/realms/iceberg/protocol/openid-connect/token --user client2:s3cr3t -d 'grant_type=client_credentials' -d 'scope=catalog' # curl http://127.0.0.1:8080/realms/iceberg/protocol/openid-connect/token --user client3:s3cr3t -d 'grant_type=client_credentials' -d 'scope=catalog' keycloak: - image: quay.io/keycloak/keycloak:24.0.4@sha256:ff02c932f0249c58f32b8ff1b188a48cc90809779a3a05931ab67f5672400ad0 + image: quay.io/keycloak/keycloak:24.0.4 depends_on: - postgres ports: @@ -181,7 +181,7 @@ services: retries: 15 postgres: - image: postgres:16.3@sha256:1bf73ccae25238fa555100080042f0b2f9be08eb757e200fe6afc1fc413a1b3c + image: postgres:16.3 ports: - "5432:5432" # set shared memory limit when using docker-compose diff --git a/docker/catalog-auth-s3-otel/docker-compose.yml b/docker/catalog-auth-s3-otel/docker-compose.yml index 07e91f0b2b3..4eb95855b2b 100644 --- a/docker/catalog-auth-s3-otel/docker-compose.yml +++ b/docker/catalog-auth-s3-otel/docker-compose.yml @@ -87,7 +87,7 @@ services: # Jaeger (OpenTelemetry traces collector) jaeger: - image: docker.io/jaegertracing/all-in-one:latest@sha256:177998a612bd025a5ed80d020392ff51fdfae586df58fc8970e419266e1bd7a8 + image: docker.io/jaegertracing/all-in-one:latest ports: # Jaeger gRPC collector, used by Nessie - "4317:4317" @@ -103,7 +103,7 @@ services: # MinIO minio: - image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z@sha256:7cb3f11447d1ac7c4b73420dd8f3601afa16ea0cd7e929ecb00be1a8af1eac05 + image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z ports: # API port, used by Nessie - "9000:9000" @@ -123,7 +123,7 @@ services: # Create MinIO bucket minio-setup: - image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z@sha256:7cb3f11447d1ac7c4b73420dd8f3601afa16ea0cd7e929ecb00be1a8af1eac05 + image: quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z depends_on: minio: condition: service_healthy @@ -146,7 +146,7 @@ services: # curl http://127.0.0.1:8080/realms/iceberg/protocol/openid-connect/token --user client2:s3cr3t -d 'grant_type=client_credentials' -d 'scope=catalog' # curl http://127.0.0.1:8080/realms/iceberg/protocol/openid-connect/token --user client3:s3cr3t -d 'grant_type=client_credentials' -d 'scope=catalog' keycloak: - image: quay.io/keycloak/keycloak:24.0.4@sha256:ff02c932f0249c58f32b8ff1b188a48cc90809779a3a05931ab67f5672400ad0 + image: quay.io/keycloak/keycloak:24.0.4 ports: - "8080:8080" environment: diff --git a/docker/dynamodb/docker-compose.yml b/docker/dynamodb/docker-compose.yml index 20ce7957123..575f47b321e 100644 --- a/docker/dynamodb/docker-compose.yml +++ b/docker/dynamodb/docker-compose.yml @@ -17,7 +17,7 @@ version: '3' services: nessie: - image: ghcr.io/projectnessie/nessie:latest@sha256:7fc6cfe427db95f660f9676e10c30c5c21a91d48bf37b2ec52abb646d246b34d + image: ghcr.io/projectnessie/nessie:latest ports: - "19120:19120" depends_on: @@ -30,6 +30,6 @@ services: - quarkus.dynamodb.aws.credentials.static-provider.access-key-id=fakeKeyId - quarkus.dynamodb.aws.credentials.static-provider.secret-access-key=fakeSecretAccessKey dynamodb: - image: amazon/dynamodb-local@sha256:22b1f856581e5c77549b319c20371c7454381d7ef039d2a386c1b0dc686573cd + image: amazon/dynamodb-local ports: - "8000:8000" diff --git a/docker/in_memory/docker-compose.yml b/docker/in_memory/docker-compose.yml index 061ef761d86..c819a8a81f8 100644 --- a/docker/in_memory/docker-compose.yml +++ b/docker/in_memory/docker-compose.yml @@ -17,7 +17,7 @@ version: '3' services: nessie: - image: ghcr.io/projectnessie/nessie:latest@sha256:7fc6cfe427db95f660f9676e10c30c5c21a91d48bf37b2ec52abb646d246b34d + image: ghcr.io/projectnessie/nessie:latest ports: - 19120:19120 environment: diff --git a/docker/mongodb/docker-compose.yml b/docker/mongodb/docker-compose.yml index 5a4e36e695e..8425d052e9d 100644 --- a/docker/mongodb/docker-compose.yml +++ b/docker/mongodb/docker-compose.yml @@ -17,7 +17,7 @@ version: '3' services: nessie: - image: ghcr.io/projectnessie/nessie:latest@sha256:7fc6cfe427db95f660f9676e10c30c5c21a91d48bf37b2ec52abb646d246b34d + image: ghcr.io/projectnessie/nessie:latest ports: - "19120:19120" depends_on: @@ -27,7 +27,7 @@ services: - quarkus.mongodb.database=nessie - quarkus.mongodb.connection-string=mongodb://root:password@mongo:27017 mongo: - image: mongo@sha256:8f9f843d383e358d9be2f172ba9d2455e8736f3c59b00330da1f1b44273ce267 + image: mongo ports: - "27017:27017" environment: diff --git a/docker/telemetry/docker-compose.yml b/docker/telemetry/docker-compose.yml index 8cbd89600c7..eeb83dcf890 100644 --- a/docker/telemetry/docker-compose.yml +++ b/docker/telemetry/docker-compose.yml @@ -2,7 +2,7 @@ version: "2" services: nessie: - image: ghcr.io/projectnessie/nessie:latest@sha256:7fc6cfe427db95f660f9676e10c30c5c21a91d48bf37b2ec52abb646d246b34d + image: ghcr.io/projectnessie/nessie:latest ports: - "19120:19120" depends_on: @@ -13,7 +13,7 @@ services: # Jaeger jaeger: - image: docker.io/jaegertracing/all-in-one:latest@sha256:177998a612bd025a5ed80d020392ff51fdfae586df58fc8970e419266e1bd7a8 + image: docker.io/jaegertracing/all-in-one:latest ports: - "16686:16686" # Jaeger UI - "4317:4317" # OTLP gRPC receiver diff --git a/gc/gc-repository-jdbc/src/intTest/resources/org/projectnessie/gc/contents/jdbc/Dockerfile-mariadb-version b/gc/gc-repository-jdbc/src/intTest/resources/org/projectnessie/gc/contents/jdbc/Dockerfile-mariadb-version index 6390b888c40..20cc32d59e5 100644 --- a/gc/gc-repository-jdbc/src/intTest/resources/org/projectnessie/gc/contents/jdbc/Dockerfile-mariadb-version +++ b/gc/gc-repository-jdbc/src/intTest/resources/org/projectnessie/gc/contents/jdbc/Dockerfile-mariadb-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM mariadb:11.4.2@sha256:a891b59da43875e5fa2e260da7901b10c5e01e63e26cc33981ffdd9ab2c50d3b +FROM mariadb:11.4.2 diff --git a/gc/gc-repository-jdbc/src/intTest/resources/org/projectnessie/gc/contents/jdbc/Dockerfile-mysql-version b/gc/gc-repository-jdbc/src/intTest/resources/org/projectnessie/gc/contents/jdbc/Dockerfile-mysql-version index 271a32773ba..5fcf88d8cd3 100644 --- a/gc/gc-repository-jdbc/src/intTest/resources/org/projectnessie/gc/contents/jdbc/Dockerfile-mysql-version +++ b/gc/gc-repository-jdbc/src/intTest/resources/org/projectnessie/gc/contents/jdbc/Dockerfile-mysql-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM mysql:8.4.0@sha256:aa021e164da6aacbefc59ed0b933427e4835636be380f3b6523f4a6c9564e1f0 +FROM mysql:8.4.0 diff --git a/gc/gc-repository-jdbc/src/intTest/resources/org/projectnessie/gc/contents/jdbc/Dockerfile-postgres-version b/gc/gc-repository-jdbc/src/intTest/resources/org/projectnessie/gc/contents/jdbc/Dockerfile-postgres-version index 15234854dee..d22ae2808af 100644 --- a/gc/gc-repository-jdbc/src/intTest/resources/org/projectnessie/gc/contents/jdbc/Dockerfile-postgres-version +++ b/gc/gc-repository-jdbc/src/intTest/resources/org/projectnessie/gc/contents/jdbc/Dockerfile-postgres-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM postgres:16.3@sha256:1bf73ccae25238fa555100080042f0b2f9be08eb757e200fe6afc1fc413a1b3c +FROM postgres:16.3 diff --git a/testing/azurite-container/src/main/resources/org/projectnessie/testing/azurite/Dockerfile-azurite-version b/testing/azurite-container/src/main/resources/org/projectnessie/testing/azurite/Dockerfile-azurite-version index 05cd999a01d..b808838b43b 100644 --- a/testing/azurite-container/src/main/resources/org/projectnessie/testing/azurite/Dockerfile-azurite-version +++ b/testing/azurite-container/src/main/resources/org/projectnessie/testing/azurite/Dockerfile-azurite-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM mcr.microsoft.com/azure-storage/azurite:3.30.0@sha256:01233a6593e2f2cb3e515731f83ca720454018b80e08207f18fa691b71bd054d +FROM mcr.microsoft.com/azure-storage/azurite:3.30.0 diff --git a/testing/gcs-container/src/main/resources/org/projectnessie/testing/gcs/Dockerfile-fake-gcs-server-version b/testing/gcs-container/src/main/resources/org/projectnessie/testing/gcs/Dockerfile-fake-gcs-server-version index e9891ad1de8..0d28eb61e46 100644 --- a/testing/gcs-container/src/main/resources/org/projectnessie/testing/gcs/Dockerfile-fake-gcs-server-version +++ b/testing/gcs-container/src/main/resources/org/projectnessie/testing/gcs/Dockerfile-fake-gcs-server-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM docker.io/fsouza/fake-gcs-server:1.49.1@sha256:2ac1a4d8eaa827cb9fe8794ea0690a4606d025666b7b032ad2896b91e675ec72 +FROM docker.io/fsouza/fake-gcs-server:1.49.1 diff --git a/testing/keycloak-container/src/main/resources/org/projectnessie/testing/keycloak/Dockerfile-keycloak-version b/testing/keycloak-container/src/main/resources/org/projectnessie/testing/keycloak/Dockerfile-keycloak-version index a9c801dc30b..f1ae5c40f86 100644 --- a/testing/keycloak-container/src/main/resources/org/projectnessie/testing/keycloak/Dockerfile-keycloak-version +++ b/testing/keycloak-container/src/main/resources/org/projectnessie/testing/keycloak/Dockerfile-keycloak-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM quay.io/keycloak/keycloak:24.0.4@sha256:ff02c932f0249c58f32b8ff1b188a48cc90809779a3a05931ab67f5672400ad0 +FROM quay.io/keycloak/keycloak:24.0.4 diff --git a/testing/minio-container/src/main/resources/org/projectnessie/minio/Dockerfile-minio-version b/testing/minio-container/src/main/resources/org/projectnessie/minio/Dockerfile-minio-version index aa44c16d418..b550f53e5b7 100644 --- a/testing/minio-container/src/main/resources/org/projectnessie/minio/Dockerfile-minio-version +++ b/testing/minio-container/src/main/resources/org/projectnessie/minio/Dockerfile-minio-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z@sha256:7cb3f11447d1ac7c4b73420dd8f3601afa16ea0cd7e929ecb00be1a8af1eac05 +FROM quay.io/minio/minio:RELEASE.2024-05-28T17-19-04Z diff --git a/testing/nessie-container/src/main/resources/org/projectnessie/testing/nessie/Dockerfile-nessie-version b/testing/nessie-container/src/main/resources/org/projectnessie/testing/nessie/Dockerfile-nessie-version index 9f64dc5e761..7052290c933 100644 --- a/testing/nessie-container/src/main/resources/org/projectnessie/testing/nessie/Dockerfile-nessie-version +++ b/testing/nessie-container/src/main/resources/org/projectnessie/testing/nessie/Dockerfile-nessie-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM ghcr.io/projectnessie/nessie:0.83.2@sha256:7fc6cfe427db95f660f9676e10c30c5c21a91d48bf37b2ec52abb646d246b34d +FROM ghcr.io/projectnessie/nessie:0.83.2 diff --git a/tools/dockerbuild/docker/Dockerfile-admintool b/tools/dockerbuild/docker/Dockerfile-admintool index 1ce150efac6..397e5938254 100644 --- a/tools/dockerbuild/docker/Dockerfile-admintool +++ b/tools/dockerbuild/docker/Dockerfile-admintool @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.18-4@sha256:399a4169b3474e949597390191faab28f404e4cacc816de1b33fa389b48f929f +FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.18-4 LABEL org.opencontainers.image.source=https://github.com/projectnessie/nessie LABEL org.opencontainers.image.description="Projectnessie Sever Admin Tool" diff --git a/tools/dockerbuild/docker/Dockerfile-gctool b/tools/dockerbuild/docker/Dockerfile-gctool index a6ad9e240d3..eba42a31df5 100644 --- a/tools/dockerbuild/docker/Dockerfile-gctool +++ b/tools/dockerbuild/docker/Dockerfile-gctool @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.18-4@sha256:399a4169b3474e949597390191faab28f404e4cacc816de1b33fa389b48f929f +FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.18-4 LABEL org.opencontainers.image.source=https://github.com/projectnessie/nessie LABEL org.opencontainers.image.description="Projectnessie GC Tool" diff --git a/tools/dockerbuild/docker/Dockerfile-server b/tools/dockerbuild/docker/Dockerfile-server index 5589ead01ce..6097675c388 100644 --- a/tools/dockerbuild/docker/Dockerfile-server +++ b/tools/dockerbuild/docker/Dockerfile-server @@ -20,7 +20,7 @@ # (See site/docs/try/configuration.md) # ### -FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.18-4@sha256:399a4169b3474e949597390191faab28f404e4cacc816de1b33fa389b48f929f +FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.18-4 LABEL org.opencontainers.image.source=https://github.com/projectnessie/nessie LABEL org.opencontainers.image.description="Projectnessie Nessie Core Server" diff --git a/versioned/storage/bigtable-tests/src/main/resources/org/projectnessie/versioned/storage/bigtabletests/Dockerfile-google-cloud-sdk-version b/versioned/storage/bigtable-tests/src/main/resources/org/projectnessie/versioned/storage/bigtabletests/Dockerfile-google-cloud-sdk-version index e340159ef2d..c8034630f72 100644 --- a/versioned/storage/bigtable-tests/src/main/resources/org/projectnessie/versioned/storage/bigtabletests/Dockerfile-google-cloud-sdk-version +++ b/versioned/storage/bigtable-tests/src/main/resources/org/projectnessie/versioned/storage/bigtabletests/Dockerfile-google-cloud-sdk-version @@ -2,4 +2,4 @@ # Version is managed by Renovate - do not edit. # See https://cloud.google.com/sdk/docs/downloads-docker#docker_image_options # Use debian_component_based because it supports linux/arm -FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:478.0.0-debian_component_based@sha256:e4f2f9dd2ebdc27e8154ab400925cd65de708c9e7b30c1807341f66daff0fde7 +FROM gcr.io/google.com/cloudsdktool/google-cloud-cli:478.0.0-debian_component_based diff --git a/versioned/storage/cassandra-tests/src/main/resources/org/projectnessie/versioned/storage/cassandratests/Dockerfile-cassandra-version b/versioned/storage/cassandra-tests/src/main/resources/org/projectnessie/versioned/storage/cassandratests/Dockerfile-cassandra-version index 442e5f3b691..e6a55c3e597 100644 --- a/versioned/storage/cassandra-tests/src/main/resources/org/projectnessie/versioned/storage/cassandratests/Dockerfile-cassandra-version +++ b/versioned/storage/cassandra-tests/src/main/resources/org/projectnessie/versioned/storage/cassandratests/Dockerfile-cassandra-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM docker.io/cassandra:5.0@sha256:3869be6ad2d0819542ccb4e1ebd4c2239e5fd756eaea821c5c81c02487a2c365 +FROM docker.io/cassandra:5.0 diff --git a/versioned/storage/cassandra-tests/src/main/resources/org/projectnessie/versioned/storage/cassandratests/Dockerfile-scylladb-version b/versioned/storage/cassandra-tests/src/main/resources/org/projectnessie/versioned/storage/cassandratests/Dockerfile-scylladb-version index 43ea506d762..79a9bd6677e 100644 --- a/versioned/storage/cassandra-tests/src/main/resources/org/projectnessie/versioned/storage/cassandratests/Dockerfile-scylladb-version +++ b/versioned/storage/cassandra-tests/src/main/resources/org/projectnessie/versioned/storage/cassandratests/Dockerfile-scylladb-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM docker.io/scylladb/scylla:5.4.6@sha256:f479b2dc70e0dc6684a606d0f76c129829c9b847521a50168ae2dd92a4ef011e +FROM docker.io/scylladb/scylla:5.4.6 diff --git a/versioned/storage/dynamodb-tests/src/main/resources/org/projectnessie/versioned/storage/dynamodbtests/Dockerfile-dynamodb-local-version b/versioned/storage/dynamodb-tests/src/main/resources/org/projectnessie/versioned/storage/dynamodbtests/Dockerfile-dynamodb-local-version index c3d183e6ea5..8c5158e01ed 100644 --- a/versioned/storage/dynamodb-tests/src/main/resources/org/projectnessie/versioned/storage/dynamodbtests/Dockerfile-dynamodb-local-version +++ b/versioned/storage/dynamodb-tests/src/main/resources/org/projectnessie/versioned/storage/dynamodbtests/Dockerfile-dynamodb-local-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM docker.io/amazon/dynamodb-local:2.5.0@sha256:22b1f856581e5c77549b319c20371c7454381d7ef039d2a386c1b0dc686573cd +FROM docker.io/amazon/dynamodb-local:2.5.0 diff --git a/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-cockroach-version b/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-cockroach-version index 61ad49b85a9..bdc7e04ab31 100644 --- a/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-cockroach-version +++ b/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-cockroach-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM cockroachdb/cockroach:v23.2.5@sha256:e48162e1a7dd7611dc87bd06c145aa22b7a6f98f6fa046c1884e58ebd82d9d51 +FROM cockroachdb/cockroach:v23.2.5 diff --git a/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-mariadb-version b/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-mariadb-version index 6390b888c40..20cc32d59e5 100644 --- a/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-mariadb-version +++ b/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-mariadb-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM mariadb:11.4.2@sha256:a891b59da43875e5fa2e260da7901b10c5e01e63e26cc33981ffdd9ab2c50d3b +FROM mariadb:11.4.2 diff --git a/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-mysql-version b/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-mysql-version index 271a32773ba..5fcf88d8cd3 100644 --- a/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-mysql-version +++ b/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-mysql-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM mysql:8.4.0@sha256:aa021e164da6aacbefc59ed0b933427e4835636be380f3b6523f4a6c9564e1f0 +FROM mysql:8.4.0 diff --git a/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-postgres-version b/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-postgres-version index 15234854dee..d22ae2808af 100644 --- a/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-postgres-version +++ b/versioned/storage/jdbc-tests/src/main/resources/org/projectnessie/versioned/storage/jdbctests/Dockerfile-postgres-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM postgres:16.3@sha256:1bf73ccae25238fa555100080042f0b2f9be08eb757e200fe6afc1fc413a1b3c +FROM postgres:16.3 diff --git a/versioned/storage/mongodb-tests/src/main/resources/org/projectnessie/versioned/storage/mongodbtests/Dockerfile-mongodb-version b/versioned/storage/mongodb-tests/src/main/resources/org/projectnessie/versioned/storage/mongodbtests/Dockerfile-mongodb-version index a5cf23b80fb..2efc8c5b084 100644 --- a/versioned/storage/mongodb-tests/src/main/resources/org/projectnessie/versioned/storage/mongodbtests/Dockerfile-mongodb-version +++ b/versioned/storage/mongodb-tests/src/main/resources/org/projectnessie/versioned/storage/mongodbtests/Dockerfile-mongodb-version @@ -1,3 +1,3 @@ # Dockerfile to provide the image name and tag to a test. # Version is managed by Renovate - do not edit. -FROM mongo:7.0.11@sha256:8f9f843d383e358d9be2f172ba9d2455e8736f3c59b00330da1f1b44273ce267 +FROM mongo:7.0.11