Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed docker compose version issue. #5

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions GettingStartedLinux.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ You will need to log out and back in for change to take affect.
Docker tools need to get installed as well.

```
$ sudo curl -L "https://github.com/docker/compose/releases/download/1.10.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
$ sudo curl -L "https://github.com/docker/compose/releases/download/1.18.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
$ sudo chmod +x /usr/local/bin/docker-compose
```

Expand All @@ -137,7 +137,7 @@ $ docker-compose --version
Should output this:

```
docker-compose version: 1.10.0
docker-compose version: 1.18.0
```

### Virtual Box
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-all.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# 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.
version: "3"
version: "3.2"
services:

# The Fluentd container is part of the data collection
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-auth-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"

services:

Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# docker stack deploy -c docker-compose-cli.yml cli
#

version: "3"
version: "3.2"
services:
cli:
image: "${REGISTRY}${REPOSITORY}voltha-cli:${TAG:-latest}"
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-consul-cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# This command will create overlay network 'consul_net'.

version: "3"
version: "3.2"
services:

consul:
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-dashd.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"
services:
#
# Dashboard daemon
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-docutests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"
services:
#
# Single-node zookeeper service
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-elasticsearch.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"

services:
elasticsearch:
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-envoy-swarm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# docker stack deploy -c docker-compose-envoy-swarm.yml envoy
#

version: "3"
version: "3.2"
services:
voltha:
image: "${REGISTRY}${REPOSITORY}voltha-envoy:${TAG:-latest}"
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-fixed-port.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"
services:
#
# Single-node zookeeper service
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-fluentd-agg-cluster.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3"
version: "3.2"
services:

#
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-fluentd-cluster.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3"
version: "3.2"
services:

#
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-grafana-swarm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# docker stack deploy -c docker-compose-grafana-swarm.yml grafana
#

version: "3"
version: "3.2"
services:
grafana:
image: "${REGISTRY}kamon/grafana_graphite:${TAG:-latest}"
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-kafka-cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#
###########################################################################################

version: '3'
version: "3.2"
services:
zk1:
image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-logstash-swarm.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3'
version: "3.2"

services:
logstash:
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-logstash.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"

services:
logstash:
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-netconf-swarm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# docker stack deploy -c docker-compose-netconf-swarm.yml netconf
#

version: "3"
version: "3.2"
services:
netconf:
image: "${REGISTRY}${REPOSITORY}voltha-netconf:${TAG:-latest}"
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-netopeer.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"
services:
netopeer:
image: "${REGISTRY}${REPOSITORY}voltha-netopeer:${TAG:-latest}"
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-ofagent-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"
services:

#
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-opennms.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"
services:
database_data:
image: "${REGISTRY}tianon/true:${TRUE_TAG:-latest}"
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# docker stack deploy -c docker-compose-registry.yml registry
#

version: "3"
version: "3.2"
services:
registry:
image: "${REGISTRY}registry:${REGISTRY_TAG:-2}"
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-stats-swarm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# docker stack deploy -c docker-compose-stats-swarm.yml stats
#

version: "3"
version: "3.2"
services:
dashd:
image: "${REGISTRY}${REPOSITORY}voltha-dashd:${TAG:-latest}"
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-system-test-dispatcher.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"
services:
#
# Single-node zookeeper service
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-system-test-encrypted.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"
services:
#
# Single-node zookeeper service
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-system-test-persistence.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"
services:
#
# Single-node zookeeper service
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-system-test-with-etcd.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"
services:
#
# Single-node zookeeper service
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-system-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"
services:
#
# Single-node zookeeper service
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-voltha-swarm.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3"
version: "3.2"
services:
vcore:
image: "${REGISTRY}${REPOSITORY}voltha-voltha:${TAG:-latest}"
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-zk-kafka-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: "3.2"
services:
#
# Single-node zookeeper service
Expand Down
19 changes: 10 additions & 9 deletions compose/voltha-stack.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,16 @@
# `data/users` configuration files can be found. Defaults
# to `/var/local`.
# DOCKER_HOST_IP -
# ZK_TAG - The tag that should be used when referencing the ZooKeeper
# docker image. Defaults to `latest`.
# KAFKA_TAG - The tag that should be used when referencing the Kafka
# docker image. Default to `1.0.0`.
# CONSUL_TAG - The tag that should be used when referencing the Consul
# docker image. Defaults to `0.9.2`.
# RADIUS_TAG - The tag that should be used when referencing the FreeRADIUS
# docker image. Defaults to `latest`.
version: "3"

# ZK_TAG - The tag that should be used when referencing the ZooKeeper
# docker image. Defaults to `3.4.11`.
# KAFKA_TAG - The tag that should be used when referencing the Kafka
# docker image. Default to `1.0.0`.
# CONSUL_TAG - The tag that should be used when referencing the Consul
# docker image. Defaults to `0.9.2`.
# RADIUS_TAG - The tag that should be used when referencing the FreeRADIUS
# docker image. Defaults to `latest`.
version: "3.2"

services:
zk1:
Expand Down