Fix Docker file path

This change modifies the docker file path that is used for the
pom.xml file and updates the instructions for building the docker
docker image.

Change-Id: I9aaf3792134292f5556d429155d144f8ef8d8018
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: SDC-993

diff --git a/README.md b/README.md
index 320b100..4a96225 100644 (file)
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ OpenECOMP SDC is delivered with 5 Docker containers:
 4. sdc-cs      - hosting cassandra
 5. sdc-es      - hosting elastic search
 
-All containers runs on the same machine and can be started by runnin the command:
+All containers runs on the same machine and can be started by running the command:
 /data/scripts/docker_run.sh -e <environment name> -r <release> -p <docker-hub-port>
 Example: /data/scripts/docker_run.sh -e OS-ETE-DFW -p 51220
 
@@ -41,7 +41,7 @@ Docker containers are build with the following profile
 
 # Getting the containers
 
-***to be changed for rrelease*** OpenECOMP SDC containers are stored on the Rackspace Nexus Docker Registry
+***to be changed for release*** OpenECOMP SDC containers are stored on the Rackspace Nexus Docker Registry
 
 The following Docker images are the actual deployment images used for running SDC
 
@@ -93,7 +93,7 @@ Example: set DOCKER_HOST=tcp://127.0.0.1:2375
 --To check if the variable set succeeded issue `echo %DOCKER_HOST%`
 
 - To compile sdc-simulator docker:
-1. Run `mvn clean install -Ddocker.buildArg.http_proxy=<http_proxy> -Ddocker.buildArg.https_proxy=<https_proxy> -P docker`
+1. Run `mvn clean package docker:build -Ddocker.buildArg.http_proxy=<http_proxy> -Ddocker.buildArg.https_proxy=<https_proxy> -P docker`
 -- The proxy arguments are passed and used as environmental variables in Dockerfiles 
 2. Copy the script /webseal-simulator/scripts/simulator_docker_run.sh to the docker engine environment and run:
 `simulator_docker_run.sh -r 1.1-STAGING-latest`

diff --git a/utils/webseal-simulator/README.txt b/utils/webseal-simulator/README.txt
index 46fd622..937d22c 100644 (file)
--- a/utils/webseal-simulator/README.txt
+++ b/utils/webseal-simulator/README.txt
@@ -1,8 +1,8 @@
-------------------------
++----------------------+
 |                      |
 |  webseal simulator   |
 |                      |
-------------------------
++----------------------+
 
 Working with webseal simulator:
 -------------------------------
@@ -11,7 +11,7 @@ Working with webseal simulator:
 2. Ftp war file: webseal-simulator\target\WSSimulator.war to your localhost vagrant machine: /home/vagrant/webseal-simulator/webapps folder
 3. Ftp configuration file: webseal-simulator\src\main\resources\webseal.conf to your localhost vagrant machine: /home/vagrant/webseal-simulator/config
 4. To run the simulator, enter to your local vagrant and run: startWebsealSimulator.sh
-5. Open browser and navigate to: http://localhost:8285/sdc1.login
+5. Open browser and navigate to: http://localhost:8285/login
 
 Note: the user in webseal configuration file will appear in the login screen. \vPressing on user link will perform authentication and redirect to SDC.
 The users should be predefined in SDC

diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index 2fa9fca..f458561 100644 (file)
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -232,7 +232,7 @@
                                                                        <alias>sdc-simulator</alias>
                                                                        <build>
                                                                                <cleanup>try</cleanup>
-                                                                               <dockerFileDir>${basedir}/sdc-simulator</dockerFileDir>
+                                                                               <dockerFileDir>${basedir}${file.separator}sdc-simulator</dockerFileDir>
                                                                                <tags>
                                                                                        <tag>${docker.tag}</tag>
                                                                                        <tag>${docker.latest.tag}</tag>

diff --git a/utils/webseal-simulator/sdc-simulator/startup.sh b/utils/webseal-simulator/sdc-simulator/startup.sh
old mode 100644 (file)
new mode 100755 (executable)