Merge branch 'release/1.1.1'

docker/samson-deployment/latest/Dockerfile

@@ -195,11 +195,12 @@ ADD crontab         /etc/cron.d/webdevops-samson-deployment
 
 RUN rake assets:precompile \
     && /opt/docker/bin/control.sh service.enable cron \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-samson-deployment \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-base --role webdevops-base-app --role webdevops-samson-deployment \
     && /opt/docker/bin/bootstrap.sh
 
 
 EXPOSE 80
+VOLUME /storage
 
 ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
 CMD ["supervisord"]

docker/samson-deployment/latest/Dockerfile.jinja2

@@ -38,6 +38,7 @@
 {{ samsonDeployment.general() }}
 
 {{ docker.expose('80') }}
+{{ docker.volume('/storage') }}
 
 {{ docker.entrypoint("/opt/docker/bin/entrypoint.sh") }}
 {{ docker.cmd("supervisord") }}

docker/samson-deployment/latest/conf/bin/service.d/nginx.d/10-init.sh

@@ -0,0 +1,6 @@
+# Prevent startup of nginx (ubuntu 16.04 needs it)
+ln -f -s /var/lib/nginx/logs /var/log/nginx
+
+# Replace markers
+find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>"   "$WEB_ALIAS_DOMAIN"
+find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>"     "$HOSTNAME"

docker/samson-deployment/latest/conf/bin/service.d/nginx.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+source /opt/docker/bin/config.sh
+
+includeScriptDir "/opt/docker/bin/service.d/nginx.d/"
+
+exec /usr/sbin/nginx

docker/samson-deployment/latest/conf/etc/supervisor.d/nginx.conf

@@ -3,7 +3,7 @@ programs=nginxd
 priority=20
 
 [program:nginxd]
-command = /usr/sbin/nginx
+command = /opt/docker/bin/service.d/nginx.sh
 process_name=%(program_name)s
 startsecs = 0
 autostart = true

docker/samson-deployment/latest/conf/provision/roles/webdevops-samson-deployment/tasks/bootstrap.yml

@@ -35,3 +35,35 @@
     group: "{{ APPLICATION_GROUP }}"
     mode: u=rwX,g=rX,o=rX
     recurse: yes
+
+- name: Remove old log directory
+  file:
+    path:  "/var/lib/nginx/logs"
+    state: absent
+
+- name: Create log directory
+  file:
+    path:  "/var/lib/nginx/logs"
+    state: directory
+
+- name: Create stdout symlinks
+  file:
+    dest:  "{{ item }}"
+    src:   "/docker.stdout"
+    state: link
+    force: yes
+  with_items:
+    - "/var/lib/nginx/logs/access.log"
+    - "/var/lib/nginx/logs/error.log"
+
+- name: Create storage directories
+  file:
+    path:  "{{ item }}"
+    state: directory
+    owner: "{{ APPLICATION_USER }}"
+    group: "{{ APPLICATION_GROUP }}"
+    mode:  u=rwX,g=rX,o=rX
+    recurse: yes
+  with_items:
+    - "/storage"
+    - "/storage/db"

provisioning/samson-deployment/general/bin/service.d/nginx.d/10-init.sh

@@ -0,0 +1,6 @@
+# Prevent startup of nginx (ubuntu 16.04 needs it)
+ln -f -s /var/lib/nginx/logs /var/log/nginx
+
+# Replace markers
+find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<ALIAS_DOMAIN>"   "$WEB_ALIAS_DOMAIN"
+find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<SERVERNAME>"     "$HOSTNAME"

provisioning/samson-deployment/general/bin/service.d/nginx.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+source /opt/docker/bin/config.sh
+
+includeScriptDir "/opt/docker/bin/service.d/nginx.d/"
+
+exec /usr/sbin/nginx

provisioning/samson-deployment/general/etc/supervisor.d/nginx.conf

@@ -3,7 +3,7 @@ programs=nginxd
 priority=20
 
 [program:nginxd]
-command = /usr/sbin/nginx
+command = /opt/docker/bin/service.d/nginx.sh
 process_name=%(program_name)s
 startsecs = 0
 autostart = true

provisioning/samson-deployment/general/provision/roles/webdevops-samson-deployment/tasks/bootstrap.yml

@@ -35,3 +35,35 @@
     group: "{{ APPLICATION_GROUP }}"
     mode: u=rwX,g=rX,o=rX
     recurse: yes
+
+- name: Remove old log directory
+  file:
+    path:  "/var/lib/nginx/logs"
+    state: absent
+
+- name: Create log directory
+  file:
+    path:  "/var/lib/nginx/logs"
+    state: directory
+
+- name: Create stdout symlinks
+  file:
+    dest:  "{{ item }}"
+    src:   "/docker.stdout"
+    state: link
+    force: yes
+  with_items:
+    - "/var/lib/nginx/logs/access.log"
+    - "/var/lib/nginx/logs/error.log"
+
+- name: Create storage directories
+  file:
+    path:  "{{ item }}"
+    state: directory
+    owner: "{{ APPLICATION_USER }}"
+    group: "{{ APPLICATION_GROUP }}"
+    mode:  u=rwX,g=rX,o=rX
+    recurse: yes
+  with_items:
+    - "/storage"
+    - "/storage/db"

template/Dockerfile/images/samson-deployment.jinja2

@@ -66,7 +66,7 @@ ADD crontab         /etc/cron.d/webdevops-samson-deployment
 
 RUN rake assets:precompile \
     && /opt/docker/bin/control.sh service.enable cron \
-    {{ provision.runRoleInline('samson-deployment ', role) }}
+    {{ provision.runRoleInline('base', 'base-app', 'samson-deployment', role) }}
 
 
 {%- endmacro %}