Migrate to using a new version of docker-compose.

.circleci/config.yml

@@ -50,7 +50,6 @@ jobs:
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
               docker login -u $DOCKER_USER -p $DOCKER_PASS
-              docker tag rookeries:build dorianpula/rookeries:latest
               docker push dorianpula/rookeries:latest
             fi
 

Makefile

@@ -6,7 +6,7 @@ build-git-tag:
 
 # Build the API image
 build: build-git-tag
-	docker build --tag rookeries:build .
+	docker-compose build rookeries
 
 # Runs all the tests
 test: build test-api test-webapp

docker-compose.yml

@@ -1,17 +1,21 @@
-rookeries:
+version: "2"
-  image: rookeries:build
+services:
-  ports:
-    - "5000:5000"
-  environment:
-    - ROOKERIES_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://admin:password@db:5432/rookeries
-    - ROOKERIES_JWT_SECRET_KEY=problematic_penguins
-    - ROOKERIES_DEFAULT_SITE=9eebecdc-8246-4b3a-9c57-86ee50c0ae75
-  links:
-    - db
 
-db:
+  rookeries:
-  image: postgres:9.6
+    build: .
-  environment:
+    image: dorianpula/rookeries:latest
-    - POSTGRES_USER=admin
+    ports:
-    - POSTGRES_PASSWORD=password
+      - "5000:5000"
-    - POSTGRES_DB=rookeries
+    environment:
+      - ROOKERIES_SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://admin:password@db:5432/rookeries
+      - ROOKERIES_JWT_SECRET_KEY=problematic_penguins
+      - ROOKERIES_DEFAULT_SITE=9eebecdc-8246-4b3a-9c57-86ee50c0ae75
+    depends_on:
+      - db
+
+  db:
+    image: postgres:9.6
+    environment:
+      - POSTGRES_USER=admin
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=rookeries

docs/changelog.rst

@@ -2,13 +2,14 @@
 Changelog
 =========
 
+* :support:`0` Migrate to using the newer CircleCI 2.0 build system.
 * :feature:`38` Re-architecture Rookeries into a single container application to simplify deployment.
 * :feature:`37` Add support for database migrations using Alembic and Flask-Alembic.
 * :bug:`35` Resolve crash caused by posting to `/api/user/` with an existing user's username.
 * :support:`36` Change workflow to publish new Docker images to Docker Hub via CircleCI.
 
 * :release:`0.6.1 <2017-03-07>`
-* :support:`0` Release to properly update a
+* :support:`0` Release to properly show the git revisions in the status endpoint.
 * :support:`34` Add git revision to the status endpoint to enable easier tracking.
 
 * :release:`0.6.0 <2017-03-07>`