CLOUD-2747 fix http.nonProxyHosts escaping for jws

Signed-off-by: rcernich <[email protected]>
jboss-openshift · Oct 8, 2018 · 9369223 · 9369223
1 parent c3fd77a
commit 9369223
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/os-jws-launch/added/launch.sh b/os-jws-launch/added/launch.sh
@@ -7,6 +7,11 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
     log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
 fi
 
+function escape_catalina_opts() {
+  local opts=($CATALINA_OPTS)
+  CATALINA_OPTS=$(printf "%q " ${opts[@]})
+}
+
 CONFIGURE_SCRIPTS=(
   $JWS_HOME/bin/launch/configure_extensions.sh
   $JWS_HOME/bin/launch/passwd.sh
@@ -24,6 +29,7 @@ CONFIGURE_SCRIPTS=(
 source $JWS_HOME/bin/launch/configure.sh
 
 CATALINA_OPTS="${CATALINA_OPTS} ${JAVA_PROXY_OPTIONS}"
+escape_catalina_opts
 
 log_info "Running $JBOSS_IMAGE_NAME image, version $JBOSS_IMAGE_VERSION"
 

diff --git a/tests/features/webserver/webserver_tomcat7.feature b/tests/features/webserver/webserver_tomcat7.feature
@@ -4,15 +4,15 @@ Feature: Openshift Tomcat 7 tests
   @jboss-webserver-3/webserver30-tomcat7-openshift
   Scenario: Check that the labels are correctly set
     Given image is built
-    Then the image should contain label com.redhat.component with value jboss-webserver-3-webserver30-tomcat7-openshift-docker
+    Then the image should contain label com.redhat.component with value jboss-webserver-3-webserver30-tomcat7-openshift-container
     And the image should contain label name with value jboss-webserver-3/webserver30-tomcat7-openshift
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.openshift.tags with value builder,java,tomcat7
 
   @jboss-webserver-3/webserver31-tomcat7-openshift
   Scenario: Check that the labels are correctly set
     Given image is built
-    Then the image should contain label com.redhat.component with value jboss-webserver-3-webserver31-tomcat7-openshift-docker
+    Then the image should contain label com.redhat.component with value jboss-webserver-3-webserver31-tomcat7-openshift-container
     And the image should contain label name with value jboss-webserver-3/webserver31-tomcat7-openshift
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.openshift.tags with value builder,java,tomcat7

diff --git a/tests/features/webserver/webserver_tomcat8.feature b/tests/features/webserver/webserver_tomcat8.feature
@@ -4,15 +4,15 @@ Feature: Openshift Tomcat 8 tests
   @jboss-webserver-3/webserver30-tomcat8-openshift
   Scenario: Check that the labels are correctly set
     Given image is built
-    Then the image should contain label com.redhat.component with value jboss-webserver-3-webserver30-tomcat8-openshift-docker
+    Then the image should contain label com.redhat.component with value jboss-webserver-3-webserver30-tomcat8-openshift-container
     And the image should contain label name with value jboss-webserver-3/webserver30-tomcat8-openshift
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.openshift.tags with value builder,java,tomcat8
 
   @jboss-webserver-3/webserver31-tomcat8-openshift
   Scenario: Check that the labels are correctly set
     Given image is built
-    Then the image should contain label com.redhat.component with value jboss-webserver-3-webserver31-tomcat8-openshift-docker
+    Then the image should contain label com.redhat.component with value jboss-webserver-3-webserver31-tomcat8-openshift-container
     And the image should contain label name with value jboss-webserver-3/webserver31-tomcat8-openshift
     And the image should contain label io.openshift.expose-services with value 8080:http
     And the image should contain label io.openshift.tags with value builder,java,tomcat8