@@ -139,7 +139,9 @@ public class DockerComputeDriver extends ComputeServiceDriverBase { | |||||
return DockerClientImpl.getInstance(dockerConfig, client); | return DockerClientImpl.getInstance(dockerConfig, client); | ||||
} | } | ||||
private static final String[] PACKER_FILES = {"run_redis.sh", "run_postgresql.sh", "run_supervisor.sh"}; | |||||
private static final String[] PACKER_FILES = { | |||||
"run_redis.sh", "run_postgresql.sh", "run_supervisor.sh", "run_cron.sh", "run_nginx.sh" | |||||
}; | |||||
@Override public void prepPackerDir(TempDir tempDir) { | @Override public void prepPackerDir(TempDir tempDir) { | ||||
try { | try { | ||||
@@ -0,0 +1,2 @@ | |||||
#!/bin/bash | |||||
nginx -g 'daemon off;' |
@@ -1,6 +1,6 @@ | |||||
- name: Install packages missing on docker ubuntu | - name: Install packages missing on docker ubuntu | ||||
apt: | apt: | ||||
name: [ 'curl', 'cron', 'iptables', 'openssh-server', 'redis', 'postgresql', 'supervisor' ] | |||||
name: [ 'curl', 'nginx', 'cron', 'iptables', 'openssh-server', 'redis', 'postgresql', 'supervisor' ] | |||||
state: present | state: present | ||||
update_cache: yes | update_cache: yes | ||||
@@ -43,6 +43,14 @@ | |||||
group: root | group: root | ||||
mode: 0755 | mode: 0755 | ||||
- name: Create /service/nginx/run | |||||
copy: | |||||
src: run_nginx.sh | |||||
dest: /service/nginx/run | |||||
owner: root | |||||
group: root | |||||
mode: 0755 | |||||
- name: Create /service/cron/run | - name: Create /service/cron/run | ||||
copy: | copy: | ||||
src: run_cron.sh | src: run_cron.sh | ||||
@@ -32,6 +32,7 @@ | |||||
service: | service: | ||||
name: nginx | name: nginx | ||||
state: stopped | state: stopped | ||||
when: packer_builder_type != 'docker' | |||||
- name: Install helper scripts | - name: Install helper scripts | ||||
copy: | copy: | ||||
@@ -1 +1 @@ | |||||
Subproject commit b19222f00bf9eb4071ed0925ded2c810f62e6e52 | |||||
Subproject commit 638ded1a9f87f9a35ec997805332517a7bca85c2 |