From d9373cacdfd4c9ed30d65c5e6027c1c67a9c3a88 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Mon, 13 Dec 2021 17:32:52 +0000 Subject: [PATCH] Upgrade recommended postgres image to version 14.1 --- docs/src/main/asciidoc/getting-started-reactive.adoc | 4 ++-- docs/src/main/asciidoc/hibernate-orm.adoc | 2 +- .../src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc | 2 +- docs/src/main/asciidoc/quartz.adoc | 2 +- docs/src/main/asciidoc/reactive-sql-clients.adoc | 2 +- docs/src/main/asciidoc/spring-data-jpa.adoc | 2 +- docs/src/main/asciidoc/spring-data-rest.adoc | 2 +- .../postgresql/deployment/PostgresqlDevServicesProcessor.java | 2 +- extensions/hibernate-reactive/deployment/pom.xml | 2 +- .../panache/hibernate-reactive-panache/deployment/pom.xml | 2 +- extensions/reactive-pg-client/deployment/pom.xml | 2 +- integration-tests/hibernate-reactive-panache-blocking/pom.xml | 2 +- integration-tests/hibernate-reactive-panache/pom.xml | 2 +- integration-tests/hibernate-reactive-postgresql/pom.xml | 2 +- integration-tests/jpa-postgresql-withxml/pom.xml | 2 +- integration-tests/jpa-postgresql/pom.xml | 2 +- integration-tests/kubernetes-service-binding-jdbc/pom.xml | 2 +- .../src/main/kubernetes/minikube.json | 2 +- integration-tests/main/pom.xml | 2 +- integration-tests/reactive-pg-client/pom.xml | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/src/main/asciidoc/getting-started-reactive.adoc b/docs/src/main/asciidoc/getting-started-reactive.adoc index 3d76e0464d1fb..9f4e9dc79655a 100644 --- a/docs/src/main/asciidoc/getting-started-reactive.adoc +++ b/docs/src/main/asciidoc/getting-started-reactive.adoc @@ -297,10 +297,10 @@ For example, you can use Docker to run your database: [source, bash] ---- -docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 \ +docker run -it --rm=true \ --name postgres-quarkus -e POSTGRES_USER=quarkus \ -e POSTGRES_PASSWORD=quarkus -e POSTGRES_DB=fruits \ - -p 5432:5432 postgres:13.1 + -p 5432:5432 postgres:14.1 ---- Then, launch the application using: diff --git a/docs/src/main/asciidoc/hibernate-orm.adoc b/docs/src/main/asciidoc/hibernate-orm.adoc index fa98499a81b01..c209ce7d0b148 100644 --- a/docs/src/main/asciidoc/hibernate-orm.adoc +++ b/docs/src/main/asciidoc/hibernate-orm.adoc @@ -184,7 +184,7 @@ Want to start a PostgreSQL server on the side with Docker? ---- docker run --rm=true --name postgres-quarkus-hibernate -e POSTGRES_USER=hibernate \ -e POSTGRES_PASSWORD=hibernate -e POSTGRES_DB=hibernate_db \ - -p 5432:5432 postgres:13.1 + -p 5432:5432 postgres:14.1 ---- This will start a non-durable empty database: ideal for a quick experiment! diff --git a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc index a057d8a70b4ff..197f3ceeb18ce 100644 --- a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc +++ b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc @@ -624,7 +624,7 @@ docker run -it --rm=true --name elasticsearch_quarkus_test -p 9200:9200 -p 9300: [source,bash] ---- -docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name postgresql_quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:13.1 +docker run -it --rm=true --name postgresql_quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:14.1 ---- == Time to play with your application diff --git a/docs/src/main/asciidoc/quartz.adoc b/docs/src/main/asciidoc/quartz.adoc index 47290170daa26..35acd9d04782f 100644 --- a/docs/src/main/asciidoc/quartz.adoc +++ b/docs/src/main/asciidoc/quartz.adoc @@ -353,7 +353,7 @@ services: - tasks-network postgres: <3> - image: postgres:13.1 + image: postgres:14.1 container_name: quarkus_test environment: - POSTGRES_USER=quarkus_test diff --git a/docs/src/main/asciidoc/reactive-sql-clients.adoc b/docs/src/main/asciidoc/reactive-sql-clients.adoc index c0df5ad98c3b9..d8648b534fe45 100644 --- a/docs/src/main/asciidoc/reactive-sql-clients.adoc +++ b/docs/src/main/asciidoc/reactive-sql-clients.adoc @@ -52,7 +52,7 @@ Do you need a ready-to-use PostgreSQL server to try out the examples? [source,bash] ---- -docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:10.5 +docker run -it --rm=true --name quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:14.1 ---- ==== diff --git a/docs/src/main/asciidoc/spring-data-jpa.adoc b/docs/src/main/asciidoc/spring-data-jpa.adoc index 0e71d0ee67f50..480f8adaf163d 100644 --- a/docs/src/main/asciidoc/spring-data-jpa.adoc +++ b/docs/src/main/asciidoc/spring-data-jpa.adoc @@ -143,7 +143,7 @@ A very easy way to accomplish that is by using the following Docker command: [source,bash] ---- -docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:11.5 +docker run -it --rm=true --name quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:14.1 ---- If you plan on using a different setup, please change your `application.properties` accordingly. diff --git a/docs/src/main/asciidoc/spring-data-rest.adoc b/docs/src/main/asciidoc/spring-data-rest.adoc index ca2b62fa0b082..1d012c12c5f53 100644 --- a/docs/src/main/asciidoc/spring-data-rest.adoc +++ b/docs/src/main/asciidoc/spring-data-rest.adoc @@ -159,7 +159,7 @@ A very easy way to accomplish that is by using the following Docker command: [source,bash] ---- -docker run --ulimit memlock=-1:-1 -it --rm=true --memory-swappiness=0 --name quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:11.5 +docker run -it --rm=true --name quarkus_test -e POSTGRES_USER=quarkus_test -e POSTGRES_PASSWORD=quarkus_test -e POSTGRES_DB=quarkus_test -p 5432:5432 postgres:14.1 ---- If you plan on using a different setup, please change your `application.properties` accordingly. diff --git a/extensions/devservices/postgresql/src/main/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java b/extensions/devservices/postgresql/src/main/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java index c0656c226dd91..a5007d3a20371 100644 --- a/extensions/devservices/postgresql/src/main/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java +++ b/extensions/devservices/postgresql/src/main/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java @@ -26,7 +26,7 @@ public class PostgresqlDevServicesProcessor { private static final Logger LOG = Logger.getLogger(PostgresqlDevServicesProcessor.class); - public static final String TAG = "13.2"; + public static final String TAG = "14.1"; @BuildStep ConsoleCommandBuildItem psqlCommand(DevServicesLauncherConfigResultBuildItem devServices) { diff --git a/extensions/hibernate-reactive/deployment/pom.xml b/extensions/hibernate-reactive/deployment/pom.xml index d17956ef49366..b6225fc53c7b3 100644 --- a/extensions/hibernate-reactive/deployment/pom.xml +++ b/extensions/hibernate-reactive/deployment/pom.xml @@ -14,7 +14,7 @@ - postgres:13.1 + postgres:14.1 vertx-reactive:postgresql://localhost:5432/hibernate_orm_test diff --git a/extensions/panache/hibernate-reactive-panache/deployment/pom.xml b/extensions/panache/hibernate-reactive-panache/deployment/pom.xml index 9659de744a9f3..fe0e3548ce071 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/pom.xml +++ b/extensions/panache/hibernate-reactive-panache/deployment/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - postgres:13.1 + postgres:14.1 vertx-reactive:postgresql://localhost:5432/hibernate_orm_test diff --git a/extensions/reactive-pg-client/deployment/pom.xml b/extensions/reactive-pg-client/deployment/pom.xml index 5dae7febfb301..e476deffff855 100644 --- a/extensions/reactive-pg-client/deployment/pom.xml +++ b/extensions/reactive-pg-client/deployment/pom.xml @@ -15,7 +15,7 @@ Quarkus - Reactive PostgreSQL Client - Deployment - postgres:13.1 + postgres:14.1 vertx-reactive:postgresql:///hibernate_orm_test diff --git a/integration-tests/hibernate-reactive-panache-blocking/pom.xml b/integration-tests/hibernate-reactive-panache-blocking/pom.xml index 2c2eb81ed7c0f..1a736fe95b051 100644 --- a/integration-tests/hibernate-reactive-panache-blocking/pom.xml +++ b/integration-tests/hibernate-reactive-panache-blocking/pom.xml @@ -14,7 +14,7 @@ To test proper error reporting and safeguards when Panache Reactive is being used in combination with blocking technologies - postgres:13.1 + postgres:14.1 vertx-reactive:postgresql://localhost:5432/hibernate_orm_test diff --git a/integration-tests/hibernate-reactive-panache/pom.xml b/integration-tests/hibernate-reactive-panache/pom.xml index 7ce74e8b07ab3..1a15432524057 100644 --- a/integration-tests/hibernate-reactive-panache/pom.xml +++ b/integration-tests/hibernate-reactive-panache/pom.xml @@ -17,7 +17,7 @@ PanacheQuery.project(Class) needs it. --> - postgres:13.1 + postgres:14.1 vertx-reactive:postgresql://localhost:5432/hibernate_orm_test diff --git a/integration-tests/hibernate-reactive-postgresql/pom.xml b/integration-tests/hibernate-reactive-postgresql/pom.xml index a41a5e81d6055..b49541736611a 100644 --- a/integration-tests/hibernate-reactive-postgresql/pom.xml +++ b/integration-tests/hibernate-reactive-postgresql/pom.xml @@ -14,7 +14,7 @@ Hibernate Reactive related tests running with the PostgreSQL database - postgres:13.1 + postgres:14.1 vertx-reactive:postgresql://localhost:5432/hibernate_orm_test diff --git a/integration-tests/jpa-postgresql-withxml/pom.xml b/integration-tests/jpa-postgresql-withxml/pom.xml index 5232c460bc902..aec4afeefde14 100644 --- a/integration-tests/jpa-postgresql-withxml/pom.xml +++ b/integration-tests/jpa-postgresql-withxml/pom.xml @@ -14,7 +14,7 @@ Module that contains JPA related tests running with the PostgreSQL database - postgres:13.1 + postgres:14.1 diff --git a/integration-tests/jpa-postgresql/pom.xml b/integration-tests/jpa-postgresql/pom.xml index 76b8faeb314f9..ccc3fcfacfffd 100644 --- a/integration-tests/jpa-postgresql/pom.xml +++ b/integration-tests/jpa-postgresql/pom.xml @@ -14,7 +14,7 @@ Module that contains JPA related tests running with the PostgreSQL database - postgres:13.1 + postgres:14.1 diff --git a/integration-tests/kubernetes-service-binding-jdbc/pom.xml b/integration-tests/kubernetes-service-binding-jdbc/pom.xml index 67becae685e91..ed9b5a01425e3 100644 --- a/integration-tests/kubernetes-service-binding-jdbc/pom.xml +++ b/integration-tests/kubernetes-service-binding-jdbc/pom.xml @@ -14,7 +14,7 @@ Quarkus - Integration Tests - Kubernetes Service Binding JDBC - postgres:13.1 + postgres:14.1 diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/kubernetes/minikube.json b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/kubernetes/minikube.json index caca28a449307..c399f822bcd9a 100644 --- a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/kubernetes/minikube.json +++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/src/main/kubernetes/minikube.json @@ -5,7 +5,7 @@ "metadata": { "labels": { "app.kubernetes.io/name": "postgres", - "app.kubernetes.io/version" : "10.6" + "app.kubernetes.io/version" : "14.1" }, "name": "postgres" }, diff --git a/integration-tests/main/pom.xml b/integration-tests/main/pom.xml index 79c311ce69fa5..915bbed92f9d1 100644 --- a/integration-tests/main/pom.xml +++ b/integration-tests/main/pom.xml @@ -592,7 +592,7 @@ - postgres:13.1 + postgres:14.1 postgresql diff --git a/integration-tests/reactive-pg-client/pom.xml b/integration-tests/reactive-pg-client/pom.xml index d418d3ed57eab..e0e8e6a907754 100644 --- a/integration-tests/reactive-pg-client/pom.xml +++ b/integration-tests/reactive-pg-client/pom.xml @@ -173,7 +173,7 @@ - postgres:13.1 + postgres:14.1 postgresql