Merge "Add proxy support in DockerFile"

diff --git a/deliveries/configure-and-run.sh b/deliveries/configure-and-run.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/deliveries/createMaria.sh b/deliveries/createMaria.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/deliveries/dbstart.sh b/deliveries/dbstart.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/deliveries/new_start.sh b/deliveries/new_start.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/deliveries/new_stop.sh b/deliveries/new_stop.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/deliveries/os_settings.sh b/deliveries/os_settings.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/deliveries/run.sh b/deliveries/run.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/ecomp-portal-widget-ms/pom.xml b/ecomp-portal-widget-ms/pom.xml
index ec6af26..35727c1 100644 (file)
--- a/ecomp-portal-widget-ms/pom.xml
+++ b/ecomp-portal-widget-ms/pom.xml
@@ -153,7 +153,7 @@
                                <version>0.4.11</version>
                                <configuration>
                                        <imageName>${project.artifactId}</imageName>
-                                       <dockerDirectory>src/main/docker</dockerDirectory>
+                                       <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
                                        <resources>
                                                        <resource>
                                                                <targetPath>/</targetPath>