Code Review
/
multicloud
/
k8s.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "ONAP4K8s helm chart"
[multicloud/k8s.git]
/
deployments
/
docker-compose.yml
diff --git
a/deployments/docker-compose.yml
b/deployments/docker-compose.yml
index
6ae7b4e
..
3fa82fe
100644
(file)
--- a/
deployments/docker-compose.yml
+++ b/
deployments/docker-compose.yml
@@
-9,33
+9,30
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-version: '
2
'
+version: '
3
'
services:
multicloud-k8s:
services:
multicloud-k8s:
- image:
nexus3.onap.org:10003/onap/multicloud/k8plugin
+ image:
${IMAGE_NAME}
build:
context: ./
args:
build:
context: ./
args:
- - HTTP_PROXY=$HTTP_PROXY
- - HTTPS_PROXY=$HTTPS_PROXY
- ports:
- - "8081:8081"
+ - HTTP_PROXY=${HTTP_PROXY}
+ - HTTPS_PROXY=${HTTPS_PROXY}
+ - NO_PROXY=${NO_PROXY}
environment:
environment:
- - CSAR_DIR=/opt/csar
- - KUBE_CONFIG_DIR=/opt/kubeconfig
- - DATABASE_TYPE=consul
- - DATABASE_IP=consul-svr
+ - HTTP_PROXY=${HTTP_PROXY}
+ - HTTPS_PROXY=${HTTPS_PROXY}
+ - NO_PROXY=${NO_PROXY},mongo
depends_on:
depends_on:
- - "consul"
+ - mongo
+ network_mode: host
volumes:
- /opt/csar:/opt/csar
volumes:
- /opt/csar:/opt/csar
- - /opt/kubeconfig:/opt/kubeconfig
- consul:
- image: consul
- hostname: consul-svr
+ - ${PWD}/k8sconfig.json:/opt/multicloud/k8splugin/k8sconfig.json:ro
+ mongo:
+ image: mongo
environment:
environment:
- - CONSUL_LOCAL_CONFIG={"datacenter":"us_west","server":true}
- command: ["agent", "-server", "-bootstrap-expect=1"]
- volumes:
- - /opt/consul/config:/consul/config
+ - HTTP_PROXY=${HTTP_PROXY}
+ - HTTPS_PROXY=${HTTPS_PROXY}
+ - NO_PROXY=${NO_PROXY}