diff options
author | 2017-09-05 09:55:54 +0000 | |
---|---|---|
committer | 2017-09-05 09:55:54 +0000 | |
commit | 36e2c4dd7010cdca1bdefbad3f63938e5a30eb88 (patch) | |
tree | 6a8cb1ef35f1ebad1285f0038f5ec1d6091b2ebf /huawei/vnfmadapter/VnfmadapterService | |
parent | 81a35e56ba300145efd062d90a41bf72352ad750 (diff) | |
parent | 448fc2e580a413b071863442d15597cf3e4ec133 (diff) |
Merge "Modify svnfm-huawei docker directory"
Diffstat (limited to 'huawei/vnfmadapter/VnfmadapterService')
-rw-r--r-- | huawei/vnfmadapter/VnfmadapterService/deployment/pom.xml | 7 | ||||
-rw-r--r-- | huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile (renamed from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/Dockerfile) | 0 | ||||
-rw-r--r-- | huawei/vnfmadapter/VnfmadapterService/docker/LICENSE (renamed from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/LICENSE) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh (renamed from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/build_image.sh) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | huawei/vnfmadapter/VnfmadapterService/docker/docker-entrypoint.sh (renamed from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/docker-entrypoint.sh) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | huawei/vnfmadapter/VnfmadapterService/docker/init-mysql.sh (renamed from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/init-mysql.sh) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | huawei/vnfmadapter/VnfmadapterService/docker/instance-config.sh (renamed from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-config.sh) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | huawei/vnfmadapter/VnfmadapterService/docker/instance-init.sh (renamed from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-init.sh) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | huawei/vnfmadapter/VnfmadapterService/docker/instance-run.sh (renamed from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-run.sh) | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | huawei/vnfmadapter/VnfmadapterService/docker/instance-workaround.sh (renamed from huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-workaround.sh) | 0 |
10 files changed, 6 insertions, 1 deletions
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 index 8ffeb862..8ffeb862 100644 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/Dockerfile +++ b/huawei/vnfmadapter/VnfmadapterService/docker/Dockerfile diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/LICENSE b/huawei/vnfmadapter/VnfmadapterService/docker/LICENSE index dd08487b..dd08487b 100644 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/LICENSE +++ b/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 index b83cf6cd..b83cf6cd 100644..100755 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/build_image.sh +++ b/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 index 756024c8..756024c8 100644..100755 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/docker-entrypoint.sh +++ b/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 index 4b925cc0..4b925cc0 100644..100755 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/init-mysql.sh +++ b/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 index ce9d31db..ce9d31db 100644..100755 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-config.sh +++ b/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 index 19953a3e..19953a3e 100644..100755 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-init.sh +++ b/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 index 2c77db92..2c77db92 100644..100755 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-run.sh +++ b/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 index 40058f56..40058f56 100644..100755 --- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/docker/instance-workaround.sh +++ b/huawei/vnfmadapter/VnfmadapterService/docker/instance-workaround.sh |