From a3a47dcafdcde8da0c4f6c4c9f7c41e44ca49d8d Mon Sep 17 00:00:00 2001 From: Falko Modler Date: Fri, 18 Dec 2020 23:55:04 +0100 Subject: [PATCH] Add docker-prune.bat --- .github/docker-prune.bat | 9 +++++++++ build-parent/pom.xml | 17 +++++++++++++++++ .../deployment/pom.xml | 2 +- .../keycloak-authorization/deployment/pom.xml | 2 +- extensions/oidc/deployment/pom.xml | 2 +- .../deployment/pom.xml | 2 +- .../reactive-mysql-client/deployment/pom.xml | 2 +- .../reactive-pg-client/deployment/pom.xml | 2 +- integration-tests/amazon-services/pom.xml | 2 +- .../elasticsearch-rest-client/pom.xml | 2 +- .../pom.xml | 2 +- .../hibernate-reactive-db2/pom.xml | 2 +- .../hibernate-reactive-mysql/pom.xml | 2 +- .../hibernate-reactive-panache/pom.xml | 2 +- .../hibernate-reactive-postgresql/pom.xml | 2 +- .../hibernate-search-orm-elasticsearch/pom.xml | 2 +- integration-tests/jpa-db2/pom.xml | 2 +- integration-tests/jpa-mariadb/pom.xml | 2 +- integration-tests/jpa-mssql/pom.xml | 2 +- integration-tests/jpa-mysql/pom.xml | 2 +- integration-tests/jpa-postgresql/pom.xml | 2 +- .../keycloak-authorization/pom.xml | 2 +- integration-tests/main/pom.xml | 2 +- integration-tests/neo4j/pom.xml | 2 +- integration-tests/oidc-code-flow/pom.xml | 2 +- integration-tests/oidc-tenancy/pom.xml | 2 +- integration-tests/oidc/pom.xml | 2 +- integration-tests/reactive-db2-client/pom.xml | 2 +- integration-tests/reactive-mysql-client/pom.xml | 2 +- integration-tests/reactive-pg-client/pom.xml | 2 +- integration-tests/redis-client/pom.xml | 2 +- 31 files changed, 55 insertions(+), 29 deletions(-) create mode 100644 .github/docker-prune.bat diff --git a/.github/docker-prune.bat b/.github/docker-prune.bat new file mode 100644 index 0000000000000..0b37a66977cfc --- /dev/null +++ b/.github/docker-prune.bat @@ -0,0 +1,9 @@ +@echo off + +rem See remarks in docker-prune.sh +if "%GITHUB_ACTIONS%"== "true" ( + docker container prune -f || exit /b + docker image prune -f || exit /b + docker network prune -f || exit /b + docker volume prune -f || exit /b +) diff --git a/build-parent/pom.xml b/build-parent/pom.xml index 295589ece619c..cece499680b47 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -25,8 +25,10 @@ 2.12.8 4.1.1 + 3.0.0-M3 3.0.0-M5 + 3.0.0 ${version.surefire.plugin} @@ -126,6 +128,9 @@ quay.io/quarkus/ubi-quarkus-native-image:20.2.0-java11 + + sh + ${maven.multiModuleProjectDirectory}/.github/docker-prune.${script.extension} @@ -970,5 +975,17 @@ + + Windows + + + Windows + + + + bat + + + diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml index 7f2e623f84f39..f6cac53c1de58 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml @@ -172,7 +172,7 @@ exec - ${basedir}/../../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/extensions/keycloak-authorization/deployment/pom.xml b/extensions/keycloak-authorization/deployment/pom.xml index 1d77b86eed5a9..4425aef6ad5f4 100644 --- a/extensions/keycloak-authorization/deployment/pom.xml +++ b/extensions/keycloak-authorization/deployment/pom.xml @@ -179,7 +179,7 @@ exec - ${basedir}/../../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/extensions/oidc/deployment/pom.xml b/extensions/oidc/deployment/pom.xml index cdad9e686f7fa..fa58b51069dc2 100644 --- a/extensions/oidc/deployment/pom.xml +++ b/extensions/oidc/deployment/pom.xml @@ -207,7 +207,7 @@ exec - ${basedir}/../../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/extensions/panache/hibernate-reactive-panache/deployment/pom.xml b/extensions/panache/hibernate-reactive-panache/deployment/pom.xml index affa7c936abe2..49b3bf49bf432 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/pom.xml +++ b/extensions/panache/hibernate-reactive-panache/deployment/pom.xml @@ -216,7 +216,7 @@ exec - ${basedir}/../../../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/extensions/reactive-mysql-client/deployment/pom.xml b/extensions/reactive-mysql-client/deployment/pom.xml index 41d8e805a6c52..77bc080ee36db 100644 --- a/extensions/reactive-mysql-client/deployment/pom.xml +++ b/extensions/reactive-mysql-client/deployment/pom.xml @@ -214,7 +214,7 @@ exec - ${basedir}/../../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/extensions/reactive-pg-client/deployment/pom.xml b/extensions/reactive-pg-client/deployment/pom.xml index dc42f0891de07..feb0a3887a140 100644 --- a/extensions/reactive-pg-client/deployment/pom.xml +++ b/extensions/reactive-pg-client/deployment/pom.xml @@ -181,7 +181,7 @@ exec - ${basedir}/../../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/amazon-services/pom.xml b/integration-tests/amazon-services/pom.xml index c2734cba09839..dcc59bdf4bebc 100644 --- a/integration-tests/amazon-services/pom.xml +++ b/integration-tests/amazon-services/pom.xml @@ -410,7 +410,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/elasticsearch-rest-client/pom.xml b/integration-tests/elasticsearch-rest-client/pom.xml index 07a3e97b8f0d2..6f9376dbe2d98 100644 --- a/integration-tests/elasticsearch-rest-client/pom.xml +++ b/integration-tests/elasticsearch-rest-client/pom.xml @@ -216,7 +216,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/elasticsearch-rest-high-level-client/pom.xml b/integration-tests/elasticsearch-rest-high-level-client/pom.xml index 277a468d40bb3..eaffa71c457f3 100644 --- a/integration-tests/elasticsearch-rest-high-level-client/pom.xml +++ b/integration-tests/elasticsearch-rest-high-level-client/pom.xml @@ -217,7 +217,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/hibernate-reactive-db2/pom.xml b/integration-tests/hibernate-reactive-db2/pom.xml index 072ded1685fe7..f41ee0d65720b 100644 --- a/integration-tests/hibernate-reactive-db2/pom.xml +++ b/integration-tests/hibernate-reactive-db2/pom.xml @@ -283,7 +283,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/hibernate-reactive-mysql/pom.xml b/integration-tests/hibernate-reactive-mysql/pom.xml index 9bdfbc65fbf62..3331fced2e507 100644 --- a/integration-tests/hibernate-reactive-mysql/pom.xml +++ b/integration-tests/hibernate-reactive-mysql/pom.xml @@ -291,7 +291,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/hibernate-reactive-panache/pom.xml b/integration-tests/hibernate-reactive-panache/pom.xml index a49acc2d83fa0..f3e59a87d62fa 100644 --- a/integration-tests/hibernate-reactive-panache/pom.xml +++ b/integration-tests/hibernate-reactive-panache/pom.xml @@ -372,7 +372,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/hibernate-reactive-postgresql/pom.xml b/integration-tests/hibernate-reactive-postgresql/pom.xml index 56be1eefe6972..6db2471c37cbf 100644 --- a/integration-tests/hibernate-reactive-postgresql/pom.xml +++ b/integration-tests/hibernate-reactive-postgresql/pom.xml @@ -277,7 +277,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml index 5ebece537d41a..d889d632b1606 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml @@ -230,7 +230,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/jpa-db2/pom.xml b/integration-tests/jpa-db2/pom.xml index 28bb4b866ecdd..66f0884293d45 100644 --- a/integration-tests/jpa-db2/pom.xml +++ b/integration-tests/jpa-db2/pom.xml @@ -285,7 +285,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/jpa-mariadb/pom.xml b/integration-tests/jpa-mariadb/pom.xml index b738b77797e52..6dd8a2308986a 100644 --- a/integration-tests/jpa-mariadb/pom.xml +++ b/integration-tests/jpa-mariadb/pom.xml @@ -288,7 +288,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/jpa-mssql/pom.xml b/integration-tests/jpa-mssql/pom.xml index a0c771b0f1c26..ac54e9118f493 100644 --- a/integration-tests/jpa-mssql/pom.xml +++ b/integration-tests/jpa-mssql/pom.xml @@ -285,7 +285,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/jpa-mysql/pom.xml b/integration-tests/jpa-mysql/pom.xml index 99d1bb686b2bc..41439bbcd6f9e 100644 --- a/integration-tests/jpa-mysql/pom.xml +++ b/integration-tests/jpa-mysql/pom.xml @@ -285,7 +285,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/jpa-postgresql/pom.xml b/integration-tests/jpa-postgresql/pom.xml index 0818a3fa13813..71d9b1d5f303b 100644 --- a/integration-tests/jpa-postgresql/pom.xml +++ b/integration-tests/jpa-postgresql/pom.xml @@ -276,7 +276,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/keycloak-authorization/pom.xml b/integration-tests/keycloak-authorization/pom.xml index 3ab41ae64ec96..afc7262158db3 100644 --- a/integration-tests/keycloak-authorization/pom.xml +++ b/integration-tests/keycloak-authorization/pom.xml @@ -327,7 +327,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/main/pom.xml b/integration-tests/main/pom.xml index 21c1019e94e48..9583aacc1106b 100644 --- a/integration-tests/main/pom.xml +++ b/integration-tests/main/pom.xml @@ -687,7 +687,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/neo4j/pom.xml b/integration-tests/neo4j/pom.xml index 4dbe73ffb16c9..2dc0162b07c4f 100644 --- a/integration-tests/neo4j/pom.xml +++ b/integration-tests/neo4j/pom.xml @@ -303,7 +303,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/oidc-code-flow/pom.xml b/integration-tests/oidc-code-flow/pom.xml index b5b06edf96df3..319f8298a8cdf 100644 --- a/integration-tests/oidc-code-flow/pom.xml +++ b/integration-tests/oidc-code-flow/pom.xml @@ -337,7 +337,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/oidc-tenancy/pom.xml b/integration-tests/oidc-tenancy/pom.xml index 4d3e7a260784d..9358f0b8cb02b 100644 --- a/integration-tests/oidc-tenancy/pom.xml +++ b/integration-tests/oidc-tenancy/pom.xml @@ -312,7 +312,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/oidc/pom.xml b/integration-tests/oidc/pom.xml index 96efc16266641..aa700b02cf585 100644 --- a/integration-tests/oidc/pom.xml +++ b/integration-tests/oidc/pom.xml @@ -297,7 +297,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/reactive-db2-client/pom.xml b/integration-tests/reactive-db2-client/pom.xml index e5fc7dd838c18..b499df4a769c0 100644 --- a/integration-tests/reactive-db2-client/pom.xml +++ b/integration-tests/reactive-db2-client/pom.xml @@ -283,7 +283,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/reactive-mysql-client/pom.xml b/integration-tests/reactive-mysql-client/pom.xml index c2a5f4ad6f98f..86e739d78c211 100644 --- a/integration-tests/reactive-mysql-client/pom.xml +++ b/integration-tests/reactive-mysql-client/pom.xml @@ -307,7 +307,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/reactive-pg-client/pom.xml b/integration-tests/reactive-pg-client/pom.xml index df9174aeb4d22..d7fb0d207d264 100644 --- a/integration-tests/reactive-pg-client/pom.xml +++ b/integration-tests/reactive-pg-client/pom.xml @@ -285,7 +285,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location} diff --git a/integration-tests/redis-client/pom.xml b/integration-tests/redis-client/pom.xml index 1ee49abab5320..a572926b87844 100644 --- a/integration-tests/redis-client/pom.xml +++ b/integration-tests/redis-client/pom.xml @@ -216,7 +216,7 @@ exec - ${basedir}/../../.github/docker-prune.sh + ${docker-prune.location}