From e0cc09cdf6696aeee8a6f2731090de9a7f083c82 Mon Sep 17 00:00:00 2001 From: kabicin Date: Wed, 31 May 2023 16:06:02 -0400 Subject: [PATCH] Resolve changes from merge conflict --- ga/22.0.0.12/kernel/helpers/runtime/docker-server.sh | 2 -- ga/latest/kernel/helpers/build/configure.sh | 2 +- ga/latest/kernel/helpers/runtime/docker-server.sh | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ga/22.0.0.12/kernel/helpers/runtime/docker-server.sh b/ga/22.0.0.12/kernel/helpers/runtime/docker-server.sh index fd450f4c..9886a7da 100755 --- a/ga/22.0.0.12/kernel/helpers/runtime/docker-server.sh +++ b/ga/22.0.0.12/kernel/helpers/runtime/docker-server.sh @@ -146,8 +146,6 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then echo "INFINISPAN_PASS: ${INFINISPAN_PASS}" fi -# Remove generated metadata -rm /opt/ibm/wlp/configure-liberty.log # Pass on to the real server run exec "$@" diff --git a/ga/latest/kernel/helpers/build/configure.sh b/ga/latest/kernel/helpers/build/configure.sh index 4602d1b7..034d462f 100755 --- a/ga/latest/kernel/helpers/build/configure.sh +++ b/ga/latest/kernel/helpers/build/configure.sh @@ -152,7 +152,7 @@ function main() { installUtility install --acceptLicense $SERVER_NAME --from=/tmp/repo.zip || rc=$?; if [ $rc -ne 22 ]; then exit $rc; fi rm -rf /tmp/repo.zip # Otherwise, if features.sh did not run, install server features. - elif [ "$FEATURES_INSTALLED" == "false" ]; then + else featureUtility installServerFeatures --acceptLicense $SERVER_NAME --noCache find /opt/ibm/wlp/lib /opt/ibm/wlp/bin ! -perm -g=rw -print0 | xargs -0 -r chmod g+rw fi diff --git a/ga/latest/kernel/helpers/runtime/docker-server.sh b/ga/latest/kernel/helpers/runtime/docker-server.sh index fd450f4c..9886a7da 100755 --- a/ga/latest/kernel/helpers/runtime/docker-server.sh +++ b/ga/latest/kernel/helpers/runtime/docker-server.sh @@ -146,8 +146,6 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then echo "INFINISPAN_PASS: ${INFINISPAN_PASS}" fi -# Remove generated metadata -rm /opt/ibm/wlp/configure-liberty.log # Pass on to the real server run exec "$@"