From: Juha Kosonen <juha.kosonen@nokia.com>
Date: Mon, 7 Oct 2019 16:21:52 +0000 (+0000)
Subject: Merge "Switch back to 1.15 in k8s layer container"
X-Git-Tag: 2.0.0~19
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=ce060c9f65de5c231d2bf6c0e3bbdf9dce7ab7d4;hp=-c;p=validation.git

Merge "Switch back to 1.15 in k8s layer container"
---

ce060c9f65de5c231d2bf6c0e3bbdf9dce7ab7d4
diff --combined docker/README.rst
index 0fff3ed,848f00a..6e0cc7d
--- a/docker/README.rst
+++ b/docker/README.rst
@@@ -106,6 -106,7 +106,6 @@@ REGISTRY, registry of the mysql image, 
  NAME, name of the mysql image, default value is validation
  TAG_PRE, first part of the image version, default value is mysql
  TAG_VER, last part of the image version, default value is latest
 -MYSQL_HOST_PORT, port on which mysql is exposed on host, default value is 3307
  
  In order to deploy the container, this script can be executed with the appropriate parameters.
  
@@@ -125,6 -126,7 +125,6 @@@ REGISTRY, the registry of the mysql ima
  NAME, the name of the mysql image, default value is validation
  TAG_PRE, the first part of the image version, default value is mysql
  TAG_VER, the last part of the image version, default value is latest
 -MYSQL_HOST_PORT, the port on which mysql is exposed on host, default value is 3307
  
  In order to deploy the container, this script can be executed with the appropriate parameters.
  
@@@ -177,7 -179,6 +177,7 @@@ CERTDIR, the directory where the SSL ce
  ENCRYPTION_KEY, the key that should be used by the AES algorithm for encrypting passwords stored in database, this variable is required
  UI_ADMIN_PASSWORD, the desired Blueprint Validation UI password for the admin user, this variable is required
  TRUST_ALL, the variable that defines whether the UI should trust all certificates or not, default value is false
 +USE_NETWORK_HOST, the variable that defines whether the UI container should run in 'network host' mode or not, default value is "false"
  
  Note that, for a functional UI, the following prerequisites are needed:
  
@@@ -231,7 -232,7 +231,7 @@@ Example
  
  .. code-block:: console
  
-     docker run -ti akraino/validation:kube-conformance-v1.16
+     docker run -ti akraino/validation:kube-conformance-v1.15
  
  By default, the container will run the `run_e2e.sh` script. If you want to
  enter the container, add */bin/sh* at the end of the command above