airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] 06/07: Fixes for doing local Docker based build of Django code
Date Wed, 16 Oct 2019 19:44:45 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 0cbc83355dda6287f9c5988b0c160310e0ec2cf3
Author: Marcus Christie <machristie@apache.org>
AuthorDate: Wed Oct 2 16:52:52 2019 -0400

    Fixes for doing local Docker based build of Django code
---
 dev-tools/ansible/django.yml                  |  2 --
 dev-tools/ansible/roles/django/tasks/main.yml | 13 +++++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dev-tools/ansible/django.yml b/dev-tools/ansible/django.yml
index 8871a6b..ed343a4 100644
--- a/dev-tools/ansible/django.yml
+++ b/dev-tools/ansible/django.yml
@@ -31,8 +31,6 @@
 
 # Create a django virtual host
 - hosts: django
-  # Limit to deploying to only 1 host at once. This is to lighten the load during the JavaScript
build step.
-  serial: 2
   name: Create/update Django portal for gateway
   roles:
     - django
diff --git a/dev-tools/ansible/roles/django/tasks/main.yml b/dev-tools/ansible/roles/django/tasks/main.yml
index 811c840..bba74f8 100644
--- a/dev-tools/ansible/roles/django/tasks/main.yml
+++ b/dev-tools/ansible/roles/django/tasks/main.yml
@@ -42,13 +42,22 @@
   register: airavata_django_portal_tempdir
   run_once: true
 
+- name: Make local temp directory for django portal clone world readable
+  local_action:
+    module: file
+    # The Django portal clone directory needs to be world readable on the
+    # remote server and rsync preserves permissions, so make the local clone
+    # directory world readable
+    path: "{{ airavata_django_portal_tempdir.path }}"
+    mode: o+rx
+  run_once: true
+
 - name: git clone django repo
   local_action:
     module: git
     repo: "{{ airavata_django_repo }}"
     dest: "{{ airavata_django_portal_tempdir.path }}"
-    # TODO: change to {{ airavata_django_git_branch }}
-    version: "local-builds"
+    version: "{{ airavata_django_git_branch }}"
     update: yes
     force: yes
   run_once: true


Mime
View raw message