diff options
| author |   Samuli Silvius <s.silvius@partner.samsung.com> | 2019-05-21 10:32:22 +0300 |
|---|---|---|
| committer | Samuli Silvius <s.silvius@partner.samsung.com> | 2019-05-31 08:23:02 +0300 |
| commit | d311b7ef3feb598daf9172cc292f06ae5daeb4d5 (patch) | |
| tree | 6b372959cd80eefa431e0f24a090a4622751dd7b /deployments/docker-compose.yml | |
| parent | 98fdb49bd98debd97fe62c5daa3ca54228ae74bf (diff) | |
Starting of k8splugin with docker-compose is brokendublin
docker-compose.yml and start.sh script cannot be used
in installer.sh to start k8splugin and mongo.
This commit modifies start.sh script to be usable in
installer.sh to start plugin before tests.
Also fixed kud_tests variable in installer.sh.
Issue-ID: MULTICLOUD-640
Change-Id: I60cc850d6f5b58df574f79ad3c65b801c59b3a14
Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Diffstat (limited to 'deployments/docker-compose.yml')
| -rw-r--r-- | deployments/docker-compose.yml | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index c4faa537..3fa82fe5 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -9,53 +9,30 @@ # See the License for the specific language governing permissions and # limitations under the License. -version: '2' +version: '3' services: multicloud-k8s: image: ${IMAGE_NAME} - networks: - multicloud_net: - ipv4_address: ${PLUGIN_IP} build: context: ./ args: - HTTP_PROXY=${HTTP_PROXY} - HTTPS_PROXY=${HTTPS_PROXY} - NO_PROXY=${NO_PROXY} - ports: - - "8081:8081" environment: - - CSAR_DIR=${CSAR_DIR} - - KUBE_CONFIG_DIR=${KUBE_CONFIG_DIR} - - DATABASE_TYPE=${DATABASE_TYPE} - - DATABASE_IP=${DATABASE_IP} - - PLUGINS_DIR=${PLUGINS_DIR} - HTTP_PROXY=${HTTP_PROXY} - HTTPS_PROXY=${HTTPS_PROXY} - - NO_PROXY=${NO_PROXY},${DATABASE_IP} + - NO_PROXY=${NO_PROXY},mongo depends_on: - mongo - links: - - mongo + network_mode: host volumes: - /opt/csar:/opt/csar - - /opt/kubeconfig:/opt/kubeconfig + - ${PWD}/k8sconfig.json:/opt/multicloud/k8splugin/k8sconfig.json:ro mongo: image: mongo - networks: - multicloud_net: - ipv4_address: ${DATABASE_IP} environment: - HTTP_PROXY=${HTTP_PROXY} - HTTPS_PROXY=${HTTPS_PROXY} - NO_PROXY=${NO_PROXY} - -networks: - multicloud_net: - driver: bridge - ipam: - driver: default - config: - - - subnet: 172.19.0.0/27 |