Implemented packages distrubution update switch

mblaschke · mblaschke · commit eccb0412d936 · 2015-08-05T22:19:31.000+02:00
diff --git a/docker/main/Centos-7 b/docker/main/Centos-7
@@ -15,6 +15,7 @@
 
 FROM webdevops/php-boilerplate:centos-7
 
+ENV PROVISION_SYS_UPDATE         0
 ENV PROVISION_PHP_DISTRIBUTION   php
 
 ENV PATH             /opt/ansible/bin:/bin:/usr/bin:/sbin:/usr/sbin
diff --git a/docker/main/Ubuntu-12.04 b/docker/main/Ubuntu-12.04
@@ -15,6 +15,7 @@
 
 FROM webdevops/php-boilerplate:ubuntu-12.04
 
+ENV PROVISION_SYS_UPDATE         0
 ENV PROVISION_PHP_DISTRIBUTION   php
 
 # Ensure UTF-8
diff --git a/docker/main/Ubuntu-14.04 b/docker/main/Ubuntu-14.04
@@ -15,6 +15,7 @@
 
 FROM webdevops/php-boilerplate:ubuntu-14.04
 
+ENV PROVISION_SYS_UPDATE         0
 ENV PROVISION_PHP_DISTRIBUTION   php
 
 # Ensure UTF-8
diff --git a/docker/main/Ubuntu-15.04 b/docker/main/Ubuntu-15.04
@@ -15,6 +15,7 @@
 
 FROM webdevops/php-boilerplate:ubuntu-15.04
 
+ENV PROVISION_SYS_UPDATE         0
 ENV PROVISION_PHP_DISTRIBUTION   php
 
 # Ensure UTF-8
diff --git a/docker/main/Ubuntu-15.10 b/docker/main/Ubuntu-15.10
@@ -15,6 +15,7 @@
 
 FROM webdevops/php-boilerplate:ubuntu-15.10
 
+ENV PROVISION_SYS_UPDATE         0
 ENV PROVISION_PHP_DISTRIBUTION   php
 
 # Ensure UTF-8
diff --git a/docker/main/Ubuntu-HHVM b/docker/main/Ubuntu-HHVM
@@ -15,6 +15,7 @@
 
 FROM webdevops/php-boilerplate:ubuntu-14.04
 
+ENV PROVISION_SYS_UPDATE         0
 ENV PROVISION_PHP_DISTRIBUTION   hhvm
 
 # Ensure UTF-8
diff --git a/docker/main/provision/playbook.yml b/docker/main/provision/playbook.yml
@@ -2,7 +2,9 @@
   vars_files:
     - /opt/docker/provision/variables.yml
   roles:
-    - common
+    - init
+    - { role: update,  when: PROVISION.SYS.UPDATE == "1" }
+    - packages
     - locales
     - users
     - supervisord
diff --git a/docker/main/provision/roles/common/tasks/update-centos.yml b/docker/main/provision/roles/common/tasks/update-centos.yml
diff --git a/docker/main/provision/roles/common/tasks/update-ubuntu.yml b/docker/main/provision/roles/common/tasks/update-ubuntu.yml
diff --git a/docker/main/provision/roles/init/tasks/main.yml b/docker/main/provision/roles/init/tasks/main.yml
@@ -0,0 +1,5 @@
+- name: Update package cache (apt-get update) ... will take some time
+  apt: update_cache=yes
+  when: ansible_distribution == 'Ubuntu'
+  tags:
+    - bootstrap
diff --git a/docker/main/provision/roles/packages/tasks/main.yml b/docker/main/provision/roles/packages/tasks/main.yml
@@ -1,13 +1,3 @@
-- include: update-centos.yml
-  when: ansible_distribution == 'CentOS'
-  tags:
-    - bootstrap
-
-- include: update-ubuntu.yml
-  when: ansible_distribution == 'Ubuntu'
-  tags:
-    - bootstrap
-
 - include: packages-centos.yml
   when: ansible_distribution == 'CentOS'
   tags:
diff --git a/docker/main/provision/roles/packages/tasks/packages-centos.yml b/docker/main/provision/roles/packages/tasks/packages-centos.yml
diff --git a/docker/main/provision/roles/packages/tasks/packages-ubuntu.yml b/docker/main/provision/roles/packages/tasks/packages-ubuntu.yml
diff --git a/docker/main/provision/roles/update/tasks/main.yml b/docker/main/provision/roles/update/tasks/main.yml
@@ -0,0 +1,9 @@
+- include: update-centos.yml
+  when: ansible_distribution == 'CentOS'
+  tags:
+    - bootstrap
+
+- include: update-ubuntu.yml
+  when: ansible_distribution == 'Ubuntu'
+  tags:
+    - bootstrap
diff --git a/docker/main/provision/roles/update/tasks/update-centos.yml b/docker/main/provision/roles/update/tasks/update-centos.yml
@@ -0,0 +1,2 @@
+- name: Update distribution packages (yum) ... will take some time
+  yum: name=* state=latest
diff --git a/docker/main/provision/roles/update/tasks/update-ubuntu.yml b/docker/main/provision/roles/update/tasks/update-ubuntu.yml
@@ -0,0 +1,2 @@
+- name: Upgrade distribution packages (apt-get dist-upgrade) ... will take some time
+  apt: upgrade=dist
diff --git a/docker/main/provision/variables.yml b/docker/main/provision/variables.yml
@@ -3,6 +3,9 @@
 PROVISION:
   CONTEXT: "{{ lookup('env','PROVISION_CONTEXT') }}"
 
+  SYS:
+    UPDATE:  "{{ lookup('env','PROVISION_SYS_UPDATE') }}"
+
   PHP:
     DISTRIBUTION: "{{ lookup('env','PROVISION_PHP_DISTRIBUTION') }}"
 
