Merge pull request #670 from WorldBank-Transport/feature/template-con…

…tainer-repo-154217004 Template out docker repository
WorldBank-Transport · Feb 5, 2018 · d5ce4cd · d5ce4cd
2 parents c1829a7 + 94cdaa1
commit d5ce4cd
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -1,13 +1,13 @@
 all: app editor web
 
 app:
-	docker build -f ./app/Dockerfile.base -t quay.io/azavea/driver-app:latest ./app
-	docker build -f ./app/Dockerfile.development -t quay.io/azavea/driver-app:latest ./app
+	docker build -f ./app/Dockerfile.base -t driver-app:latest ./app
+	docker build -f ./app/Dockerfile.development -t driver-app:latest ./app
 
 editor:
-	docker build -f ./schema_editor/Dockerfile -t quay.io/azavea/driver-editor:latest ./schema_editor
+	docker build -f ./schema_editor/Dockerfile -t driver-editor:latest ./schema_editor
 
 web:
-	docker build -f ./web/Dockerfile -t quay.io/azavea/driver-web:latest ./web
+	docker build -f ./web/Dockerfile -t driver-web:latest ./web
 
 .PHONY: all app editor web
diff --git a/app/Dockerfile.development b/app/Dockerfile.development
@@ -1,4 +1,4 @@
-FROM quay.io/azavea/driver-app:latest
+FROM driver-app:latest
 
 RUN pip install --no-cache-dir --process-dependency-links --allow-external djsonb -r dev-requirements.txt --src /opt
 EXPOSE 8000

diff --git a/app/black_spots/tasks/forecast_segment_incidents.py b/app/black_spots/tasks/forecast_segment_incidents.py
@@ -1,4 +1,5 @@
 import subprocess
+import os
 
 from django.conf import settings
 
@@ -18,12 +19,16 @@ def forecast_segment_incidents(segments_csv, output_path):
     Returns:
         Path of forecast file generated by the R script
     """
+    analysis_container = 'quay.io/azavea/driver-analysis'
+    docker_repository = os.environ.get('DOCKER_REPOSITORY')
+    if docker_repository is not None:
+        analysis_container = docker_repository + '/driver-analysis'
     cmd = ['docker',
            'run',
            '--rm',
            '--volumes-from',
            'driver-celery',
-           'quay.io/azavea/driver-analysis',
+           analysis_container,
            'Rscript',
            'blackspot_model.R',
            '--outputfile',

diff --git a/deployment/ansible/group_vars/development b/deployment/ansible/group_vars/development
@@ -1,6 +1,7 @@
 ---
 ## DOCKER SETTINGS
 docker_options: "-H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock --storage-driver=aufs"
+docker_repository: ""
 
 ## POSTGRESQL SETTINGS
 postgresql_host: "{{ lookup('env', 'DRIVER_DATABASE_IP') | default('192.168.12.101', true) }}"

diff --git a/deployment/ansible/group_vars/production.example b/deployment/ansible/group_vars/production.example
@@ -21,6 +21,11 @@ app_version: "0.0.0"
 # instances are configured to use https.
 app_domain_name: "your.driver-domain.here"
 
+## DOCKER SETTINGS
+# The docker repository you want your app to pull images from. The default is "quay.io/azavea/".
+# The trailing / is required.
+docker_repository: "quay.io/azavea/"
+
 # The *internal* IP address of the hosts for the different components of the web application. DRIVER
 # runs on three servers: A database, a web app server, and a Celery (asynchronous tasks) server. If
 # your servers have only a single IP address, then use that. If they have multiple IP addresses, use

diff --git a/deployment/ansible/group_vars/production.j2 b/deployment/ansible/group_vars/production.j2
@@ -21,6 +21,11 @@ app_version: {{ app_version }}
 # instances are configured to use https.
 app_domain_name: {{ app_domain_name }}
 
+## DOCKER SETTINGS
+# The docker repository you want your app to pull images from. The default is "quay.io/azavea/".
+# The trailing / is required.
+docker_repository: "quay.io/azavea/"
+
 # The *internal* IP address of the hosts for the different components of the web application. DRIVER
 # runs on three servers: A database, a web app server, and a Celery (asynchronous tasks) server. If
 # your servers have only a single IP address, then use that. If they have multiple IP addresses, use

diff --git a/deployment/ansible/group_vars/staging b/deployment/ansible/group_vars/staging
@@ -51,3 +51,6 @@ ip_addresses_app:
     - "{{ hostvars['app']['ansible_ec2_local_ipv4'] }}"
 ip_addresses_celery:
     - "{{ hostvars['celery']['ansible_ec2_local_ipv4'] }}"
+
+## DOCKER SETTINGS
+docker_repository: "quay.io/azavea/"
diff --git a/deployment/ansible/roles/driver.app/tasks/main.yml b/deployment/ansible/roles/driver.app/tasks/main.yml
@@ -17,20 +17,20 @@
   command: >
     docker build
       -f {{ root_app_dir }}/Dockerfile.base
-      -t quay.io/azavea/driver-app:{{ docker_image_tag }}
+      -t {{ docker_repository }}driver-app:{{ docker_image_tag }}
       {{ root_app_dir }}
   when: developing
 
 - name: Build application Docker image (dev tools)
   command: >
     docker build
       -f {{ root_app_dir }}/Dockerfile.development
-      -t quay.io/azavea/driver-app:{{ docker_image_tag }}
+      -t {{ docker_repository }}driver-app:{{ docker_image_tag }}
       {{ root_app_dir }}
   when: developing
 
 - name: Pull application Docker image
-  command: /usr/bin/docker pull quay.io/azavea/driver-app:{{ docker_image_tag }}
+  command: /usr/bin/docker pull {{ docker_repository }}driver-app:{{ docker_image_tag }}
   when: staging or production
   notify:
     - Restart driver-app

diff --git a/deployment/ansible/roles/driver.app/templates/upstart-app.conf.j2 b/deployment/ansible/roles/driver.app/templates/upstart-app.conf.j2
@@ -16,7 +16,7 @@ pre-start script
   /usr/bin/docker rm driver-app || true
 
   {% if 'development' not in group_names -%}
-  /usr/bin/docker pull quay.io/azavea/driver-app:{{ docker_image_tag }}
+  /usr/bin/docker pull {{ docker_repository }}driver-app:{{ docker_image_tag }}
   {% endif %}
 end script
 
@@ -41,7 +41,7 @@ exec /usr/bin/docker run \
   --env DRIVER_ADMIN_GROUP='{{ driver_admin_group }}' \
   --log-driver syslog \
 {% if celery %} --entrypoint '/bin/bash -c' \
-{% endif %}  quay.io/azavea/driver-app:{{ docker_image_tag }} {% if celery %} \
+{% endif %}  {{ docker_repository }}driver-app:{{ docker_image_tag }} {% if celery %} \
   celery -A driver worker --queue=path --loglevel=info --concurrency=4
 {% endif %}
 

diff --git a/deployment/ansible/roles/driver.celery/tasks/main.yml b/deployment/ansible/roles/driver.celery/tasks/main.yml
@@ -3,20 +3,20 @@
   command: >
     docker build
       -f {{ root_app_dir }}/Dockerfile.base
-      -t quay.io/azavea/driver-app:{{ docker_image_tag }}
+      -t driver-app:{{ docker_image_tag }}
       {{ root_app_dir }}
   when: developing
 
 - name: Build application Docker image (dev tools)
   command: >
     docker build
       -f {{ root_app_dir }}/Dockerfile.development
-      -t quay.io/azavea/driver-app:{{ docker_image_tag }}
+      -t driver-app:{{ docker_image_tag }}
       {{ root_app_dir }}
   when: developing
 
 - name: Pull application Docker image
-  command: /usr/bin/docker pull quay.io/azavea/driver-app:{{ docker_image_tag}}
+  command: /usr/bin/docker pull {{ docker_repository }}driver-app:{{ docker_image_tag}}
   when: staging or production
   notify:
     - Restart driver-celery

diff --git a/deployment/ansible/roles/driver.celery/templates/upstart-celery.conf.j2 b/deployment/ansible/roles/driver.celery/templates/upstart-celery.conf.j2
@@ -16,12 +16,13 @@ pre-start script
   /usr/bin/docker rm driver-celery || true
 
   {% if 'development' not in group_names -%}
-  /usr/bin/docker pull quay.io/azavea/driver-app:{{ docker_image_tag }}
+  /usr/bin/docker pull {{ docker_repository }}driver-app:{{ docker_image_tag }}
   {% endif %}
 end script
 
 exec /usr/bin/docker run \
   --name driver-celery \
+  --env DOCKER_REPOSITORY={{ docker_repository }} \
   --publish 4000:4000 \
   --volume /var/run/docker.sock:/var/run/docker.sock \
   --volume {{ root_static_dir }}:{{ root_static_dir }} \
@@ -36,7 +37,7 @@ exec /usr/bin/docker run \
   {% endfor -%}
   --log-driver syslog \
   --entrypoint 'celery' \
-  quay.io/azavea/driver-app:{{ docker_image_tag }} \
+  {{ docker_repository }}driver-app:{{ docker_image_tag }} \
   -A driver worker --queue=taskworker \
   --loglevel={% if 'development' in group_names %}debug{% else %}info{% endif %} \
   --concurrency=4 \

diff --git a/deployment/ansible/roles/driver.gradle/tasks/main.yml b/deployment/ansible/roles/driver.gradle/tasks/main.yml
@@ -17,12 +17,12 @@
   command: >
     docker build
       -f {{ gradle_dir }}/Dockerfile
-      -t quay.io/azavea/driver-gradle:{{ docker_image_tag }}
+      -t {{ docker_repository }}driver-gradle:{{ docker_image_tag }}
       {{ gradle_dir }}
   when: developing
 
 - name: Pull gradle Docker image
-  command: /usr/bin/docker pull quay.io/azavea/driver-gradle:{{ docker_image_tag }}
+  command: /usr/bin/docker pull {{ docker_repository }}driver-gradle:{{ docker_image_tag }}
   when: staging or production
 
 - name: Configure gradle service definition

diff --git a/deployment/ansible/roles/driver.gradle/templates/upstart-gradle.conf.j2 b/deployment/ansible/roles/driver.gradle/templates/upstart-gradle.conf.j2
@@ -16,7 +16,7 @@ pre-start script
   /usr/bin/docker rm driver-gradle || true
 
   {% if 'development' not in group_names -%}
-  /usr/bin/docker pull quay.io/azavea/driver-gradle:{{ docker_image_tag }}
+  /usr/bin/docker pull {{ docker_repository }}driver-gradle:{{ docker_image_tag }}
   {% endif %}
 end script
 
@@ -28,7 +28,7 @@ exec /usr/bin/docker run \
   --env {{ k }}="{{ v }}" \
   {% endfor -%}
   --log-driver syslog \
-  quay.io/azavea/driver-gradle:{{ docker_image_tag }}
+  {{ docker_repository }}driver-gradle:{{ docker_image_tag }}
 
 post-stop script
   /usr/bin/docker kill driver-gradle

diff --git a/deployment/ansible/roles/driver.r-docker/tasks/main.yml b/deployment/ansible/roles/driver.r-docker/tasks/main.yml
@@ -3,10 +3,10 @@
   command: >
     docker build
       -f {{ root_analysis_dir }}/Dockerfile
-      -t quay.io/azavea/driver-analysis:{{ docker_image_tag }}
+      -t {{ docker_repository }}driver-analysis:{{ docker_image_tag }}
       {{ root_analysis_dir }}
   when: developing
 
 - name: Pull application Docker image
-  command: /usr/bin/docker pull quay.io/azavea/driver-analysis:{{ docker_image_tag }}
+  command: /usr/bin/docker pull {{ docker_repository }}driver-analysis:{{ docker_image_tag }}
   when: staging or production
diff --git a/deployment/ansible/roles/driver.web/tasks/development.yml b/deployment/ansible/roles/driver.web/tasks/development.yml
@@ -3,7 +3,7 @@
   command: >
     /usr/bin/docker build
       -f {{ editor_dir }}/Dockerfile
-      -t quay.io/azavea/driver-editor:{{ docker_image_tag }}
+      -t {{ docker_repository }}driver-editor:{{ docker_image_tag }}
       {{ editor_dir }}
 
 - name: Build production editor app
@@ -13,14 +13,14 @@
       --name driver-editor
       --volume {{ editor_dir }}:{{ editor_dir }}
       --log-driver syslog
-      quay.io/azavea/driver-editor:{{ docker_image_tag }}
+      {{ docker_repository }}driver-editor:{{ docker_image_tag }}
       build
 
 - name: Build web Docker image
   command: >
     /usr/bin/docker build
       -f {{ web_dir }}/Dockerfile
-      -t quay.io/azavea/driver-web:{{ docker_image_tag }}
+      -t {{ docker_repository }}driver-web:{{ docker_image_tag }}
       {{ web_dir }}
 
 - name: Build production web app
@@ -31,5 +31,5 @@
       --volume {{ editor_dir }}:{{ editor_dir }}
       --volume {{ web_dir }}:{{ web_dir }}
       --log-driver syslog
-      quay.io/azavea/driver-web:{{ docker_image_tag }}
+      {{ docker_repository }}driver-web:{{ docker_image_tag }}
       build
diff --git a/deployment/ansible/roles/driver.web/tasks/staging_or_production.yml b/deployment/ansible/roles/driver.web/tasks/staging_or_production.yml
@@ -1,6 +1,6 @@
 ---
 - name: Pull editor Docker image
-  command: /usr/bin/docker pull quay.io/azavea/driver-editor:{{ docker_image_tag }}
+  command: /usr/bin/docker pull {{ docker_repository }}driver-editor:{{ docker_image_tag }}
 
 - name: Build production editor app
   command: >
@@ -10,18 +10,18 @@
       --volume {{ editor_scripts_dir }}/config.js:{{ editor_scripts_dir }}/config.js
       --volume {{ editor_build_dir }}:{{ editor_build_dir }}
       --log-driver syslog
-      quay.io/azavea/driver-editor:{{ docker_image_tag }}
+      {{ docker_repository }}driver-editor:{{ docker_image_tag }}
       build
 
 - name: Create editor data container
   command: >
     /usr/bin/docker create
       --volume {{ editor_dir }}
       --name driver-editor
-    quay.io/azavea/driver-editor:{{ docker_image_tag }}
+    {{ docker_repository }}driver-editor:{{ docker_image_tag }}
 
 - name: Pull web Docker image
-  command: /usr/bin/docker pull quay.io/azavea/driver-web:{{ docker_image_tag }}
+  command: /usr/bin/docker pull {{ docker_repository }}driver-web:{{ docker_image_tag }}
 
 - name: Build production web app
   command: >
@@ -34,7 +34,7 @@
       --volume {{ web_dir }}/app/index.html:{{ web_dir }}/app/index.html
       --volume {{ web_build_dir }}:{{ web_build_dir }}
       --log-driver syslog
-      quay.io/azavea/driver-web:{{ docker_image_tag }}
+      {{ docker_repository }}driver-web:{{ docker_image_tag }}
       build
 
 - name: Remove editor data container

diff --git a/scripts/grunt.sh b/scripts/grunt.sh
@@ -24,15 +24,15 @@ case "$1" in
     PUBLISHED_PORT=9000
     LIVERELOAD_PORT=35731
     VOLUME_ROOT="/opt/schema_editor"
-    IMAGE_NAME="quay.io/azavea/driver-editor:latest"
+    IMAGE_NAME="driver-editor:latest"
     ;;
 
   web)
     CONTAINER_NAME="driver-web"
     PUBLISHED_PORT=9001
     LIVERELOAD_PORT=35732
     VOLUME_ROOT="/opt/web"
-    IMAGE_NAME="quay.io/azavea/driver-web:latest"
+    IMAGE_NAME="driver-web:latest"
     ;;
 
   *)