From 448fc2e580a413b071863442d15597cf3e4ec133 Mon Sep 17 00:00:00 2001
From: luxin <luxin7@huawei.com>
Date: Tue, 5 Sep 2017 16:02:45 +0800
Subject: [PATCH] Modify svnfm-huawei docker directory

Change-Id: I1c75b95266bc0f0e29a28ddfe7f1a5a58fbca601
Issue-Id:VFC-273
Signed-off-by: luxin <luxin7@huawei.com>
---
 huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml           | 7 ++++++-
 .../{deployment/src/main/release => }/docker/Dockerfile            | 0
 .../{deployment/src/main/release => }/docker/LICENSE               | 0
 .../{deployment/src/main/release => }/docker/build_image.sh        | 0
 .../{deployment/src/main/release => }/docker/docker-entrypoint.sh  | 0
 .../{deployment/src/main/release => }/docker/init-mysql.sh         | 0
 .../{deployment/src/main/release => }/docker/instance-config.sh    | 0
 .../{deployment/src/main/release => }/docker/instance-init.sh      | 0
 .../{deployment/src/main/release => }/docker/instance-run.sh       | 0
 .../src/main/release => }/docker/instance-workaround.sh            | 0
 10 files changed, 6 insertions(+), 1 deletion(-)
 rename huawei/vnfmadapter/VnfmadapterService/{deployment/src/main/release => }/docker/Dockerfile (100%)
 rename huawei/vnfmadapter/VnfmadapterService/{deployment/src/main/release => }/docker/LICENSE (100%)
 rename huawei/vnfmadapter/VnfmadapterService/{deployment/src/main/release => }/docker/build_image.sh (100%)
 mode change 100644 => 100755
 rename huawei/vnfmadapter/VnfmadapterService/{deployment/src/main/release => }/docker/docker-entrypoint.sh (100%)
 mode change 100644 => 100755
 rename huawei/vnfmadapter/VnfmadapterService/{deployment/src/main/release => }/docker/init-mysql.sh (100%)
 mode change 100644 => 100755
 rename huawei/vnfmadapter/VnfmadapterService/{deployment/src/main/release => }/docker/instance-config.sh (100%)
 mode change 100644 => 100755
 rename huawei/vnfmadapter/VnfmadapterService/{deployment/src/main/release => }/docker/instance-init.sh (100%)
 mode change 100644 => 100755
 rename huawei/vnfmadapter/VnfmadapterService/{deployment/src/main/release => }/docker/instance-run.sh (100%)
 mode change 100644 => 100755
 rename huawei/vnfmadapter/VnfmadapterService/{deployment/src/main/release => }/docker/instance-workaround.sh (100%)
 mode change 100644 => 100755

diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml b/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml
index e3ab0cfd..c832236e 100644
--- a/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml
+++ b/huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2016, Huawei Technologies Co., Ltd.
+    Copyright (c) 2016-2017, Huawei Technologies Co., Ltd.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -70,6 +70,11 @@
                                 exclude(name: "**/.gitignore")
                                 }
                                 }
+                                ant.copy(todir: "${deployUnzip}/docker") {
+                                fileset(dir: "${basedir}/../docker"){
+                                exclude(name: "**/.gitignore")
+                                }
+                                }
                                 ant.copy(todir:
                                 "${deployUnzip}/webapps/ROOT") {
                                 fileset(dir:
diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/Dockerfile b/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile
similarity index 100%
rename from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/Dockerfile
rename to huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile
diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/LICENSE b/huawei/vnfmadapter/VnfmadapterService/docker/LICENSE
similarity index 100%
rename from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/LICENSE
rename to huawei/vnfmadapter/VnfmadapterService/docker/LICENSE
diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/build_image.sh b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
old mode 100644
new mode 100755
similarity index 100%
rename from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/build_image.sh
rename to huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/docker-entrypoint.sh b/huawei/vnfmadapter/VnfmadapterService/docker/docker-entrypoint.sh
old mode 100644
new mode 100755
similarity index 100%
rename from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/docker-entrypoint.sh
rename to huawei/vnfmadapter/VnfmadapterService/docker/docker-entrypoint.sh
diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/init-mysql.sh b/huawei/vnfmadapter/VnfmadapterService/docker/init-mysql.sh
old mode 100644
new mode 100755
similarity index 100%
rename from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/init-mysql.sh
rename to huawei/vnfmadapter/VnfmadapterService/docker/init-mysql.sh
diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-config.sh b/huawei/vnfmadapter/VnfmadapterService/docker/instance-config.sh
old mode 100644
new mode 100755
similarity index 100%
rename from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-config.sh
rename to huawei/vnfmadapter/VnfmadapterService/docker/instance-config.sh
diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-init.sh b/huawei/vnfmadapter/VnfmadapterService/docker/instance-init.sh
old mode 100644
new mode 100755
similarity index 100%
rename from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-init.sh
rename to huawei/vnfmadapter/VnfmadapterService/docker/instance-init.sh
diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-run.sh b/huawei/vnfmadapter/VnfmadapterService/docker/instance-run.sh
old mode 100644
new mode 100755
similarity index 100%
rename from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-run.sh
rename to huawei/vnfmadapter/VnfmadapterService/docker/instance-run.sh
diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-workaround.sh b/huawei/vnfmadapter/VnfmadapterService/docker/instance-workaround.sh
old mode 100644
new mode 100755
similarity index 100%
rename from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-workaround.sh
rename to huawei/vnfmadapter/VnfmadapterService/docker/instance-workaround.sh
-- 
2.16.6