dalsze rpace nad setup.sh

master
Michał 'rysiek' Woźniak 2015-01-04 23:41:48 +01:00
parent 25b4107b6a
commit 19ef1e48d6
2 changed files with 45 additions and 48 deletions

View File

@ -22,8 +22,8 @@ ENV APP_GROUP www-data
#RUN mkdir -p /opt/applications
# log and run
RUN mkdir -p /var/log/phpfpm && chown $APP_USER:$APP_GROUP /var/log/phpfpm
RUN mkdir -p /var/run/phpfpm && chown $APP_USER:$APP_GROUP /var/run/phpfpm
RUN mkdir -p /var/log/php-fpm && chown $APP_USER:$APP_GROUP /var/log/php-fpm
RUN mkdir -p /var/run/php-fpm && chown $APP_USER:$APP_GROUP /var/run/php-fpm
# php.ini customizations.
RUN sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 10M/g" /etc/php5/fpm/php.ini
@ -38,14 +38,14 @@ RUN sed -i "s/pool_name/$APP_NAME/g" /etc/php5/fpm/pool.d/$APP_NAME.conf && \
sed -i "s/app_group/$APP_GROUP/g" /etc/php5/fpm/pool.d/$APP_NAME.conf
# Change the default error log location.
RUN sed -i "s@error_log = /var/log/php5-fpm.log@error_log = /var/log/phpfpm/$APP_NAME-php-fpm5.access.log@g" /etc/php5/fpm/php-fpm.conf
RUN sed -i "s@error_log = /var/log/php5-fpm.log@error_log = /var/log/php-fpm/$APP_NAME-php-fpm5.access.log@g" /etc/php5/fpm/php-fpm.conf
# info
RUN echo " \n\
\n\
******************************************************** \n\
RUNNING THE CONTAINER: \n\
docker run -d -v <socket_dir>:/var/run/phpfpm -v <log_dir>:/var/log/phpfpm -v <php_dir>:/opt/php --name <plug-php-fpm> <plug/php-fpm> \n\
docker run -d -v <socket_dir>:/var/run/php-fpm -v <log_dir>:/var/log/php-fpm -v <php_dir>:/opt/php --name <plug-php-fpm> <plug/php-fpm> \n\
\n\
ENVIRONMENT VARIABLES: \n\
APP_NAME - name of the app; default: www \n\
@ -54,7 +54,7 @@ RUN echo " \n\
******************************************************** \n\n\
"
VOLUME ["/var/run/phpfpm", "/var/log/phpfpm", "/opt/php"]
VOLUME ["/var/run/php-fpm", "/var/log/php-fpm", "/opt/php"]
CMD []
ENTRYPOINT ["/usr/sbin/php5-fpm", "-F", "--fpm-config", "/etc/php5/fpm/php-fpm.conf"]

View File

@ -12,11 +12,16 @@ fi
# katalog obecny
startdir=`pwd`
# prefix obrazów, kontenerów, ...
prefix="plug"
# budujemy nowy dom...
cd images/
for img in *; do
# informujemy
echo -ne "\n\n - buduję: $prefix/$img\n"
# budujemy
docker build -t plug/$img $img || exit 1
docker build -t "$prefix/$img" $img || exit 1
done
# wracamy
@ -29,29 +34,29 @@ cd "$startdir"
# potrzebujemy sudo
echo "By jechać dalej, potrzebujemy sudo. To ja poproszę..."
sudo echo -i || exit 2
sudo echo -ne " ...mamy sudo, jedziemy dalej.\n\n\n" || exit 2
# tworzymy
sudo mkdir -p "$static_data_dir"
# run
sudo mkdir "$static_data_dir/run"
sudo mkdir "$static_data_dir/run/phpfpm"
sudo mkdir "$static_data_dir/run/php-fpm"
sudo mkdir "$static_data_dir/run/openldap"
# logi
sudo mkdir "$static_data_dir/logs/"
sudo mkdir "$static_data_dir/logs/postgres"
sudo mkdir "$static_data_dir/logs/phpfpm"
sudo mkdir "$static_data_dir/logs/php-fpm"
sudo mkdir "$static_data_dir/logs/openldap"
sudo mkdir "$static_data_dir/logs/nginx-public"
sudo mkdir "$static_data_dir/logs/nginx-internal"
# dane
sudo mkdir "$static_data_dir/data"
sudo mkdir "$static_data_dir/data/postgres"
sudo mkdir "$static_data_dir/data/phpfpm"
sudo mkdir "$static_data_dir/data/phpfpm/frontend"
sudo mkdir "$static_data_dir/data/phpfpm/rest"
sudo mkdir "$static_data_dir/data/phpfpm/pgadmin"
sudo mkdir "$static_data_dir/data/phpfpm/ldapadmin"
sudo mkdir "$static_data_dir/data/php-fpm"
sudo mkdir "$static_data_dir/data/php-fpm/frontend"
sudo mkdir "$static_data_dir/data/php-fpm/rest"
sudo mkdir "$static_data_dir/data/php-fpm/pgadmin"
sudo mkdir "$static_data_dir/data/php-fpm/ldapadmin"
# configs if needed
if [ ! -e "$static_data_dir/configs" ]; then
@ -66,18 +71,10 @@ sudo chown -R root:root "$static_data_dir"
# obrazy
#
prefix="plug"
# postgres
img_postgres="$prefix/postgres"
# nginx
img_nginx_public="$prefix/nginx:public"
img_nginx_internal="$prefix/nginx:internal"
# phpfpm
img_phpfpm_frontend="$prefix/phpfpm:frontend"
img_phpfpm_rest="$prefix/phpfpm:rest"
img_phpfpm_pgadmin="$prefix/phpfpm:pgadmin"
img_phpfpm_ldapadmin="$prefix/phpfpm:ldapadmin"
img_nginx="$prefix/nginx"
img_phpfpm="$prefix/php-fpm"
#
# kontenery
@ -86,13 +83,13 @@ img_phpfpm_ldapadmin="$prefix/phpfpm:ldapadmin"
# postgres
cnt_postgres="$prefix-postgres"
# nginx
cnt_nginx_public="$prefix-nginx:public"
cnt_nginx_internal="$prefix-nginx:internal"
# phpfpm
cnt_phpfpm_frontend="$prefix-phpfpm:frontend"
cnt_phpfpm_rest="$prefix-phpfpm:rest"
cnt_phpfpm_pgadmin="$prefix-phpfpm:pgadmin"
cnt_phpfpm_ldapadmin="$prefix-phpfpm:ldapadmin"
cnt_nginx_public="$prefix-nginx.public"
cnt_nginx_internal="$prefix-nginx.internal"
# php-fpm
cnt_phpfpm_frontend="$prefix-php-fpm.frontend"
cnt_phpfpm_rest="$prefix-php-fpm.rest"
cnt_phpfpm_pgadmin="$prefix-php-fpm.pgadmin"
cnt_phpfpm_ldapadmin="$prefix-php-fpm.ldapadmin"
#
@ -108,39 +105,39 @@ cnt_phpfpm_ldapadmin="$prefix-phpfpm:ldapadmin"
docker run -d \
-v "$static_data_dir/configs/nginx-public/":/etc/nginx/sites-enabled:ro \
-v "$static_data_dir/logs/nginx-public/"/var/log/nginx/ \
-v "$static_data_dir/run/phpfpm/":/var/run/phpfpm/ \
-v "$static_data_dir/run/php-fpm/":/var/run/php-fpm/ \
--name $cnt_nginx_public \
$img_nginx_public
$img_nginx
# - wewnętrzny
docker run -d \
-v "$static_data_dir/configs/nginx-internal/":/etc/nginx/sites-enabled:ro \
-v "$static_data_dir/logs/nginx-internal/"/var/log/nginx/ \
-v "$static_data_dir/run/phpfpm/":/var/run/phpfpm/ \
-v "$static_data_dir/run/php-fpm/":/var/run/php-fpm/ \
--name $cnt_nginx_internal \
$img_nginx_internal
$img_nginx
# a teraz phpfpmy!
# a teraz php-fpmy!
# - frontend
docker run -d \
-v "$static_data_dir/logs/phpfpm/":/var/log/phpfpm \
-v "$static_data_dir/run/phpfpm/":/var/run/phpfpm \
-v "$static_data_dir/logs/php-fpm/":/var/log/php-fpm \
-v "$static_data_dir/run/php-fpm/":/var/run/php-fpm \
--name $cnt_phpfpm_frontend \
$img_phpfpm_frontend
$img_phpfpm
# - rest
docker run -d \
-v "$static_data_dir/logs/phpfpm/":/var/log/phpfpm \
-v "$static_data_dir/run/phpfpm/":/var/run/phpfpm \
-v "$static_data_dir/logs/php-fpm/":/var/log/php-fpm \
-v "$static_data_dir/run/php-fpm/":/var/run/php-fpm \
--name $cnt_phpfpm_rest \
$img_phpfpm_rest
$img_phpfpm
# - pgadmin
docker run -d \
-v "$static_data_dir/logs/phpfpm/":/var/log/phpfpm \
-v "$static_data_dir/run/phpfpm/":/var/run/phpfpm \
-v "$static_data_dir/logs/php-fpm/":/var/log/php-fpm \
-v "$static_data_dir/run/php-fpm/":/var/run/php-fpm \
--name $cnt_phpfpm_pgadmin \
$img_phpfpm_pgadmin
$img_phpfpm
# - ldapadmin
#docker run -d \
# -v "$static_data_dir/logs/phpfpm/":/var/log/phpfpm \
# -v "$static_data_dir/run/phpfpm/":/var/run/phpfpm \
# -v "$static_data_dir/logs/php-fpm/":/var/log/php-fpm \
# -v "$static_data_dir/run/php-fpm/":/var/run/php-fpm \
# --name $cnt_phpfpm_ldapadmin \
# $img_phpfpm_ldapadmin
# $img_phpfpm