Browse Source

install nginx service, don't try to restart it on docker

tags/v1.5.4
Jonathan Cobb 4 years ago
parent
commit
28cd4251ac
5 changed files with 16 additions and 3 deletions
  1. +3
    -1
      bubble-server/src/main/java/bubble/cloud/compute/docker/DockerComputeDriver.java
  2. +2
    -0
      bubble-server/src/main/resources/docker/run_nginx.sh
  3. +9
    -1
      bubble-server/src/main/resources/packer/roles/common/tasks/docker.yml
  4. +1
    -0
      bubble-server/src/main/resources/packer/roles/nginx/tasks/main.yml
  5. +1
    -1
      bubble-web

+ 3
- 1
bubble-server/src/main/java/bubble/cloud/compute/docker/DockerComputeDriver.java View File

@@ -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 {


+ 2
- 0
bubble-server/src/main/resources/docker/run_nginx.sh View File

@@ -0,0 +1,2 @@
#!/bin/bash
nginx -g 'daemon off;'

+ 9
- 1
bubble-server/src/main/resources/packer/roles/common/tasks/docker.yml View File

@@ -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


+ 1
- 0
bubble-server/src/main/resources/packer/roles/nginx/tasks/main.yml View File

@@ -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
bubble-web

@@ -1 +1 @@
Subproject commit b19222f00bf9eb4071ed0925ded2c810f62e6e52
Subproject commit 638ded1a9f87f9a35ec997805332517a7bca85c2

Loading…
Cancel
Save