Build voltha/consul Container Image with its own file system, not mounted volume from the Host.
-- Added --data-dir Option in Consul Launch Command
-- Added --config-dir Option Consul Launch Command
-- Fixed the Launch issue and removed --data-dir & --config-dir Option from launch command.
Build voltha/registrator Comtainer Image with its own file system.
-- Fixed nginx volume path (typo)
Change-Id: I4640e81feaac683b057bdfa5cda5e16579f58a37
diff --git a/Makefile b/Makefile
index d7cce7c..db15322 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
VENVDIR := venv-$(shell uname -s | tr '[:upper:]' '[:lower:]')
-.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha chameleon ofagent podder netconf shovel onos dashd vcli portainer grafana nginx
+.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha chameleon ofagent podder netconf shovel onos dashd vcli portainer grafana nginx consul registrator
# This should to be the first and default target in this Makefile
help:
@@ -55,6 +55,8 @@
@echo "portainer : Build the portainer docker container"
@echo "grafana : Build the grafana docker container"
@echo "nginx : Build the nginx docker container"
+ @echo "consul : Build the consul docker container"
+ @echo "registrator : Build the registrator docker container"
@echo
## New directories can be added here
@@ -91,7 +93,7 @@
build: protos containers
-containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester config-push dashd vcli portainer grafana nginx
+containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester config-push dashd vcli portainer grafana nginx consul registrator
docker-base:
docker build -t cord/voltha-base -f docker/Dockerfile.base .
@@ -135,6 +137,12 @@
nginx:
docker build -t voltha/nginx -f docker/Dockerfile.nginx .
+consul:
+ docker build -t voltha/consul -f docker/Dockerfile.consul .
+
+registrator:
+ docker build -t voltha/registrator -f docker/Dockerfile.registrator .
+
grafana:
docker build -t voltha/grafana -f docker/Dockerfile.grafana .
diff --git a/compose/docker-compose-system-test-encrypted.yml b/compose/docker-compose-system-test-encrypted.yml
index 6ccf4cb..4b8a7c5 100644
--- a/compose/docker-compose-system-test-encrypted.yml
+++ b/compose/docker-compose-system-test-encrypted.yml
@@ -30,8 +30,8 @@
# Single-node consul agent
#
consul:
- image: consul:latest
- command: agent -server -bootstrap -client 0.0.0.0 -ui
+ image: voltha/consul
+ command: agent -server -bootstrap -client 0.0.0.0 -ui
ports:
- "8300:8300"
- "8400:8400"
@@ -42,24 +42,21 @@
SERVICE_8300_IGNORE: "yes"
SERVICE_8400_IGNORE: "yes"
SERVICE_8500_NAME: "consul-rest"
- volumes:
- - "/cord/incubator/voltha/consul_config:/consul/config"
#
# Registrator
#
registrator:
- image: gliderlabs/registrator:latest
+ image: voltha/registrator
command: [
"-ip=${DOCKER_HOST_IP}",
"-retry-attempts", "100",
# "-internal",
- "consul://consul:8500"
+ "consul://consul-tls:8501"
]
links:
- consul
volumes:
- "/var/run/docker.sock:/tmp/docker.sock"
- - "/cord/incubator/voltha/reg_config:/reg/config"
environment:
CONSUL_CACERT: "/reg/config/voltha-CA-template.pem"
CONSUL_TLSCERT: "/reg/config/voltha-cert-template.crt"
diff --git a/docker/Dockerfile.consul b/docker/Dockerfile.consul
new file mode 100644
index 0000000..48e7347
--- /dev/null
+++ b/docker/Dockerfile.consul
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM consul
+
+# Create Consul Config Directory
+RUN mkdir -p /consul/config
+COPY consul_config /consul/config
diff --git a/docker/Dockerfile.registrator b/docker/Dockerfile.registrator
new file mode 100644
index 0000000..413e776
--- /dev/null
+++ b/docker/Dockerfile.registrator
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+#
+# Copyright 2016 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM gliderlabs/registrator
+
+# Create Registrator Config Directory
+RUN mkdir -p /reg/config
+COPY reg_config /reg/config