Switch from fig to docker-compose

docker-compose no longer supports fig.yml files, so finish the switch
completely.

Change-Id: I2faec3ebd04a129368a3c40f99ff7b0389c998eb
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/README b/README
index 5a18d8e945f32ebf5c8b22a3c617e4811d539ee2..fca2536d91c23c75364252abdb72842093c150f3 100644 (file)
--- a/README
+++ b/README
@@ -87,14 +87,11 @@ Running The Integration Tests
 To run the integration tests locally the following components are required:
 
  - Docker
- - Fig or Docker Compose
+ - Docker Compose
 
 To install docker, follow the installation guide for your platform:
    http://docs.docker.com/installation/
 
-To install fig:
-   http://www.fig.sh/install.html
-
 To install Docker Compose:
    http://docs.docker.com/compose/install/
 
@@ -102,19 +99,17 @@ To run the integration tests:
 
     mvn clean install
     # The first time you need to set everything up
-    fig up -d
+    docker-compose up -d
     # Later runs only need the containers to be started
-    fig start
+    docker-compose start
     # OSX
     mvn verify -Pintegrationtest -Dovsdbserver.ipaddress=$(boot2docker ip 2>/dev/null) -Dovsdbserver.port=6640
     # Linux
     mvn verify -Pintegrationtest -Dovsdbserver.ipaddress=127.0.0.1 -Dovsdbserver.port=6640 -Dovsdb.controller.address=<addr of docker interface> -Dovsdb.userspace.enabled=yes
-    fig stop
+    docker-compose stop
 
 On Linux you'll generally need to run fig as root (sudo fig ...).
 
-If you're using Docker Compose, replace "fig" above with "docker-compose" and ignore the warnings.
-
 Running the docker image manually:
     sudo docker run -itd --cap-add NET_ADMIN -p 6640:6640 jhershbe/centos7-ovs:latest
 

diff --git a/fig.yml b/docker-compose.yml
similarity index 100%
rename from fig.yml
rename to docker-compose.yml