diff options
| author |   Victor Morales <victor.morales@intel.com> | 2019-01-06 07:22:08 -0800 |
|---|---|---|
| committer | Victor Morales <victor.morales@intel.com> | 2019-01-06 07:22:08 -0800 |
| commit | e2bf06f1e964b05334ac179831c18e6cb95b396d (patch) | |
| tree | 10cdba1c23104f9f5b9b3a20269006dbcbac1f2c /deployments/docker-compose.yml | |
| parent | 6bbfadbdfe670334ad7755f3578d668d66dd9756 (diff) | |
Refactor docker-compose variables
The default environment variables required by docker-compose.yml
file was exported to .env file to have better control on them.
Change-Id: I52408cbf6e6918621a10158866d899d5f66a47eb
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: MULTICLOUD-301
Diffstat (limited to 'deployments/docker-compose.yml')
| -rw-r--r-- | deployments/docker-compose.yml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml index a72bd096..c4faa537 100644 --- a/deployments/docker-compose.yml +++ b/deployments/docker-compose.yml @@ -16,24 +16,24 @@ services: image: ${IMAGE_NAME} networks: multicloud_net: - ipv4_address: 172.19.0.3 + ipv4_address: ${PLUGIN_IP} build: context: ./ args: - - HTTP_PROXY=$HTTP_PROXY - - HTTPS_PROXY=$HTTPS_PROXY - - NO_PROXY=$NO_PROXY + - HTTP_PROXY=${HTTP_PROXY} + - HTTPS_PROXY=${HTTPS_PROXY} + - NO_PROXY=${NO_PROXY} ports: - "8081:8081" environment: - - CSAR_DIR=/opt/csar - - KUBE_CONFIG_DIR=/opt/kubeconfig - - DATABASE_TYPE=mongo - - DATABASE_IP=172.19.0.2 - - PLUGINS_DIR=/opt/multicloud/k8s - - HTTP_PROXY=$HTTP_PROXY - - HTTPS_PROXY=$HTTPS_PROXY - - NO_PROXY=$NO_PROXY,172.19.0.2 + - 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} depends_on: - mongo links: @@ -45,11 +45,11 @@ services: image: mongo networks: multicloud_net: - ipv4_address: 172.19.0.2 + ipv4_address: ${DATABASE_IP} environment: - HTTP_PROXY: $HTTP_PROXY - HTTPS_PROXY: $HTTPS_PROXY - NO_PROXY: $NO_PROXY + - HTTP_PROXY=${HTTP_PROXY} + - HTTPS_PROXY=${HTTPS_PROXY} + - NO_PROXY=${NO_PROXY} networks: multicloud_net: |