Moved Ubuntu 14.04

webdevops · Jun 29, 2015 · 76d59e3 · 76d59e3
1 parent 3696c54
commit 76d59e3
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 0 deletions.
diff --git a/docker/main/Dockerfile → docker/main/ubuntu-14.04/Dockerfile b/docker/main/Dockerfile → docker/main/ubuntu-14.04/Dockerfile
diff --git a/docker/main/bin/customization.sh → ...er/main/ubuntu-14.04/bin/customization.sh b/docker/main/bin/customization.sh → ...er/main/ubuntu-14.04/bin/customization.sh
diff --git a/docker/main/bin/dnsmasq.sh → docker/main/ubuntu-14.04/bin/dnsmasq.sh b/docker/main/bin/dnsmasq.sh → docker/main/ubuntu-14.04/bin/dnsmasq.sh
diff --git a/docker/main/bin/init-mysql.sh → docker/main/ubuntu-14.04/bin/init-mysql.sh b/docker/main/bin/init-mysql.sh → docker/main/ubuntu-14.04/bin/init-mysql.sh
diff --git a/docker/main/bin/init-php.sh → docker/main/ubuntu-14.04/bin/init-php.sh b/docker/main/bin/init-php.sh → docker/main/ubuntu-14.04/bin/init-php.sh
@@ -29,6 +29,8 @@ sed -i "s@listen = /var/run/php5-fpm.sock@listen = 9000@" /etc/php5/fpm/pool.d/w
 echo "
 ; Server resource settings
 
+listen = 0.0.0.0:9000
+
 pm.max_children = 10
 pm.start_servers = 2
 pm.min_spare_servers = 1

diff --git a/docker/main/bin/init-ssmtp.sh → docker/main/ubuntu-14.04/bin/init-ssmtp.sh b/docker/main/bin/init-ssmtp.sh → docker/main/ubuntu-14.04/bin/init-ssmtp.sh
diff --git a/docker/main/bin/init-system.sh → docker/main/ubuntu-14.04/bin/init-system.sh b/docker/main/bin/init-system.sh → docker/main/ubuntu-14.04/bin/init-system.sh
diff --git a/docker/main/bin/install.sh → docker/main/ubuntu-14.04/bin/install.sh b/docker/main/bin/install.sh → docker/main/ubuntu-14.04/bin/install.sh
@@ -32,6 +32,7 @@ mkdir -p /opt/docker/ \
 apt-get update
 
 apt-get install -y \
+    sudo \
     supervisor \
     dnsmasq \
     ssmtp \

diff --git a/docker/main/bin/logwatch.sh → docker/main/ubuntu-14.04/bin/logwatch.sh b/docker/main/bin/logwatch.sh → docker/main/ubuntu-14.04/bin/logwatch.sh
diff --git a/docker/main/conf/locale.conf → docker/main/ubuntu-14.04/conf/locale.conf b/docker/main/conf/locale.conf → docker/main/ubuntu-14.04/conf/locale.conf
diff --git a/docker/main/conf/php.ini → docker/main/ubuntu-14.04/conf/php.ini b/docker/main/conf/php.ini → docker/main/ubuntu-14.04/conf/php.ini
diff --git a/docker/main/conf/supervisord.conf → ...r/main/ubuntu-14.04/conf/supervisord.conf b/docker/main/conf/supervisord.conf → ...r/main/ubuntu-14.04/conf/supervisord.conf
diff --git a/docker/main/entrypoint.sh → docker/main/ubuntu-14.04/entrypoint.sh b/docker/main/entrypoint.sh → docker/main/ubuntu-14.04/entrypoint.sh
diff --git a/docker/main/htdocs/.gitkeep → docker/main/ubuntu-14.04/htdocs/.gitkeep b/docker/main/htdocs/.gitkeep → docker/main/ubuntu-14.04/htdocs/.gitkeep