Merge pull request #116 from metacpan/oalders/profiles

Use compose profiles

Author: oalders

.circleci/config.yml

@@ -1,4 +1,6 @@
-# Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
+---
+# Use the latest 2.1 version of CircleCI pipeline process engine. See:
+# https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
 # Orchestrate or schedule a set of jobs
 workflows:
@@ -8,25 +10,16 @@ workflows:
 jobs:
   build-and-test:
     machine: true
-    resource_class: medium
+    resource_class: large
     steps:
-      # CircleCI has its own docker-compose already installed, but as of this writing, their version is too old to understand our docker-compose.yml
-      - run:
-          name: Install Docker Compose
-          command: |
-            set -x
-            curl -L https://github.com/docker/compose/releases/download/1.26.2/docker-compose-`uname -s`-`uname -m` > /home/circleci/bin/docker-compose
-            sudo chmod +x /home/circleci/bin/docker-compose
-            which docker-compose
-            docker-compose --version
       - checkout
       - run:
           command: |
             ./bin/metacpan-docker init
           name: clone missing repositories
       - run:
           command: |
-            docker-compose --verbose up -d api_test
+            docker-compose --verbose --profile test up -d
           name: compose up
       # Since we're running docker-compose -d, we don't actually know if
       # Elasticsearch is available at the time this build step begins. We
@@ -38,12 +31,12 @@ jobs:
       - run:
           name: Run complete MetaCPAN API Test Suite
           command: |
-            docker-compose exec -T api_test prove -lr --jobs 2 t
-            docker-compose down
+            docker-compose --profile test exec -T api_test prove -lr --jobs 4 t
+            docker-compose --profile test down
       - run:
           name: Show Docker container logs on Error
           command: |
-            docker-compose logs
+            docker-compose --profile test logs
             docker stats --no-stream
             docker ps -a | head
           when: on_fail

README.md

@@ -101,11 +101,12 @@ These repositories are automatically mounted into the appropriate docker
 containers allowing the developer to use their preferred tools to work with the
 source code.
 
-The `docker compose up` command on its own will bring up the entire stack in the
-foreground (logs will be displayed).
+The `docker compose --profile dev up` command on its own will bring up the
+entire stack in the foreground (logs will be displayed).
 
-The `docker compose up` command will also fetch the official container images
-from [MetaCPAN Docker Hub](https://cloud.docker.com/u/metacpan/repository/list)
+The `docker compose --profile dev up` command will also fetch the official
+container images from
+[MetaCPAN Docker Hub](https://cloud.docker.com/u/metacpan/repository/list)
 repositories.
 
 This will build the Docker containers for MetaCPAN, PostgreSQL and Elasticsearch
@@ -128,7 +129,7 @@ elsewhere.
 Alternatively, if you just want to hack on the web frontend, you can run this
 instead of all the above:
 
-    docker compose up web
+    docker compose up web-server
 
 From here, you can proceed and hack on the MetaCPAN code at `src/metacpan-api`
 and/or `src/metacpan-web` directories, and saving edits will reload the
@@ -137,7 +138,7 @@ corresponding apps automatically!
 When done hacking (or, more likely, when you need to rebuild/refresh your Docker
 environment) you can then run
 
-    docker compose down
+    docker compose --profile dev down
 
 in another terminal to stop all MetaCPAN services and remove the containers.
 

docker-compose.yml

@@ -23,6 +23,8 @@ services:
   #
 
   api:
+    profiles:
+      - dev
     depends_on:
       - elasticsearch
       - pghost
@@ -34,8 +36,8 @@ services:
     env_file:
       - .env
     command: >
-      /metacpan-api/wait-for-es.sh http://elasticsearch:9200 "" --
       /metacpan-api/wait-for-it.sh -t 15 -s -h ${PG_HOST} -p ${PG_PORT} --
+      /metacpan-api/wait-for-es.sh http://elasticsearch:9200 "" --
       ${API_SERVER} ./bin/api.pl
     volumes:
       - type: volume
@@ -60,6 +62,8 @@ services:
       - web-network
 
   api_test:
+    profiles:
+      - test
     depends_on:
       - elasticsearch_test
       - pghost
@@ -69,8 +73,8 @@ services:
     env_file:
       - localapi_test.env
     command: >
-      /metacpan-api/wait-for-es.sh http://elasticsearch_test:9200 "" --
       /metacpan-api/wait-for-it.sh -t 15 -s -h ${PG_HOST} -p ${PG_PORT} --
+      /metacpan-api/wait-for-es.sh http://elasticsearch_test:9200 "" --
       ${API_SERVER} ./bin/api.pl
     volumes:
       - type: volume
@@ -94,6 +98,9 @@ services:
       - elasticsearch
 
   ingest:
+    profiles:
+      - dev
+      - ingest
     image: metacpan/metacpan-ingest:latest
     volumes:
       - type: volume
@@ -116,6 +123,8 @@ services:
   #  |___/         |_|
 
   grep:
+    profiles:
+      - grep
     image: metacpan/metacpan-grep-front-end:latest
     build:
       context: ./src/metacpan-grep-front-end
@@ -146,6 +155,9 @@ services:
   #
 
   elasticsearch:
+    profiles:
+      - dev
+      - ingest
     image: elasticsearch:2.4
     volumes:
       - type: volume
@@ -178,6 +190,8 @@ services:
   #
 
   elasticsearch_test:
+    profiles:
+      - test
     image: elasticsearch:2.4
     volumes:
       - type: volume
@@ -204,6 +218,9 @@ services:
   #
 
   pghost:
+    profiles:
+      - dev
+      - test
     hostname: pghost
     image: "postgres:${PG_VERSION_TAG:-9.6-alpine}"
     build: