Skip to content

Commit be0e247

Browse files
committed
Rename sso feature exclusion flag
1 parent f8d5ea4 commit be0e247

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

Diff for: README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ Refer to [Repository and proxy modifications](https://openliberty.io/docs/ref/co
8080

8181
This section describes the optional enterprise functionality that can be enabled via the Dockerfile during `build` time, by setting particular build-arguments (`ARG`) and calling `RUN configure.sh`. Each of these options trigger the inclusion/exclusion of specific configuration via XML snippets (except for `VERBOSE`), described below:
8282

83+
* `EXCLUDE_CONFIG_SSO_FEATURES`
84+
* Description: When set to `true` the `sso_features.xml` config will be excluded from feature installation (see [SECURITY.md](/SECURITY.md) for usage).
85+
* XML Snippet Location: [sso-features.xml](/releases/latest/kernel-slim/helpers/build/configuration_snippets/sso-features.xml)
8386
* `HZ_SESSION_CACHE`
8487
* Description: Enable the persistence of HTTP sessions using JCache by adding the `sessionCache-1.0` feature.
8588
* XML Snippet Location: [hazelcast-sessioncache.xml](/releases/latest/kernel-slim/helpers/build/configuration_snippets/hazelcast-sessioncache.xml)
86-
* `SKIP_SSO_FEATURE_INSTALL`
87-
* Description: Disable the install of `appSecurity-2.0` and `socialLogin-1.0` when `SEC_SSO_PROVIDERS` is set. (see [SECURITY.md](/SECURITY.md) for usage.)
88-
* XML Snippet Location: [sso-features.xml](/releases/latest/kernel-slim/helpers/build/configuration_snippets/sso-features.xml)
8989
* `TLS` (`SSL` is deprecated)
9090
* Description: Enable Transport Security in Liberty by adding the `transportSecurity-1.0` feature (includes support for SSL).
9191
* XML Snippet Location: [keystore.xml](/releases/latest/kernel-slim/helpers/build/configuration_snippets/keystore.xml).

Diff for: SECURITY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ The following variables configure container security for Single Sign-On using th
5151
Your configuration is not supported. Update the configuration to use features that support either the Jakarta EE or Java EE programming models, but not both.
5252
```
5353

54-
* To avoid this error, set `ARG SKIP_SSO_FEATURE_INSTALL=true` in your Dockerfile.
54+
* To avoid this error, set `ARG EXCLUDE_CONFIG_SSO_FEATURES=true` in your Dockerfile.
5555

5656
### Configuration needed at image build time or at container deploy time:
5757

Diff for: releases/22.0.0.12/full/helpers/build/configure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function main() {
8686
fi
8787

8888
if [[ -n "$SEC_SSO_PROVIDERS" ]]; then
89-
if [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
89+
if [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
9090
cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
9191
fi
9292
parseProviders $SEC_SSO_PROVIDERS

Diff for: releases/22.0.0.12/kernel-slim/helpers/build/features.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -n "$INFINISPAN_SERVICE_NAME" ] || [ "${HZ_SESSION_CACHE}" == "client" ] ||
2020
fi
2121

2222
# SSO
23-
if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
23+
if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
2424
cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
2525
fi
2626

Diff for: releases/23.0.0.3/full/helpers/build/configure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function main() {
8686
fi
8787

8888
if [[ -n "$SEC_SSO_PROVIDERS" ]]; then
89-
if [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
89+
if [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
9090
cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
9191
fi
9292
parseProviders $SEC_SSO_PROVIDERS

Diff for: releases/23.0.0.3/kernel-slim/helpers/build/features.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -n "$INFINISPAN_SERVICE_NAME" ] || [ "${HZ_SESSION_CACHE}" == "client" ] ||
2020
fi
2121

2222
# SSO
23-
if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
23+
if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
2424
cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
2525
fi
2626

Diff for: releases/23.0.0.5/full/helpers/build/configure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function main() {
8686
fi
8787

8888
if [[ -n "$SEC_SSO_PROVIDERS" ]]; then
89-
if [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
89+
if [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
9090
cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
9191
fi
9292
parseProviders $SEC_SSO_PROVIDERS

Diff for: releases/23.0.0.5/kernel-slim/helpers/build/features.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -n "$INFINISPAN_SERVICE_NAME" ] || [ "${HZ_SESSION_CACHE}" == "client" ] ||
2020
fi
2121

2222
# SSO
23-
if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
23+
if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
2424
cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
2525
fi
2626

Diff for: releases/latest/beta/helpers/build/configure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function main() {
8686
fi
8787

8888
if [[ -n "$SEC_SSO_PROVIDERS" ]]; then
89-
if [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
89+
if [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
9090
cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
9191
fi
9292
parseProviders $SEC_SSO_PROVIDERS

Diff for: releases/latest/full/helpers/build/configure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function main() {
8686
fi
8787

8888
if [[ -n "$SEC_SSO_PROVIDERS" ]]; then
89-
if [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
89+
if [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
9090
cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
9191
fi
9292
parseProviders $SEC_SSO_PROVIDERS

Diff for: releases/latest/kernel-slim/helpers/build/features.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if [ -n "$INFINISPAN_SERVICE_NAME" ] || [ "${HZ_SESSION_CACHE}" == "client" ] ||
2020
fi
2121

2222
# SSO
23-
if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$SKIP_SSO_FEATURE_INSTALL" != "true" ]]; then
23+
if [[ -n "$SEC_SSO_PROVIDERS" ]] && [[ "$EXCLUDE_CONFIG_SSO_FEATURES" != "true" ]]; then
2424
cp $SNIPPETS_SOURCE/sso-features.xml $SNIPPETS_TARGET_DEFAULTS
2525
fi
2626

0 commit comments

Comments
 (0)