Resolve changes from merge conflict

WASdev · May 31, 2023 · e0cc09c · e0cc09c
1 parent ba64c93
commit e0cc09c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 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
@@ -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
@@ -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
@@ -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 "$@"