Skip to content

Commit 57bce75

Browse files
committed
[OPENJDK-631] adjust S2I_SOURCE_DEPLOYMENTS_FILTER for Quarkus
Alter the default value of S2I_SOURCE_DEPLOYMENTS_FILTER from "*.jar" to "*.jar quarkus-app". For the default Quarkus build layout (fast jar), these are the required path components to copy out of the build directory (target). There is a very low risk that a non-quarkus app has a path matching quarkus-app in its build directory which should not be copied into the resulting image. The mitigation in such a scenario is to override S2I_SOURCE_DEPLOYMENTS_FILTER. Remove the duplicate definition of S2I_SOURCE_DEPLOYMENTS_FILTER from modules/s2i/bash/module.yaml, retaining only the one in modules/s2i/core/module.yaml. The reason for the duplication is historical: other products overrode the value with different defaults (* -> *.jar for us; *.war for JWS, etc.) in other modules. Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 54236cd commit 57bce75

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

modules/s2i/bash/module.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ description: Customization of common Maven S2I for Java S2I image.
66
envs:
77
- name: JBOSS_CONTAINER_JAVA_S2I_MODULE
88
value: /opt/jboss/container/java/s2i
9-
- name: S2I_SOURCE_DEPLOYMENTS_FILTER
10-
value: "*.jar"
119

1210
execute:
1311
- script: configure.sh

modules/s2i/core/module.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ envs:
7878
- name: S2I_SOURCE_DEPLOYMENTS_FILTER
7979
description: >
8080
Space separated list of filters to be applied when copying deployments.
81-
Defaults to ** * **
82-
value: "*"
81+
Defaults to ** *.jar quarkus-app **
82+
value: "*.jar quarkus-app"
8383
example: "*.jar *.war *.ear"
8484

8585
- name: S2I_TARGET_DEPLOYMENTS_DIR

0 commit comments

Comments
 (0)