rysiek
/
hangar18
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dalsze prace nad pgadminem

master
Michał 'rysiek' Woźniak 2015-01-06 14:42:02 +01:00
parent b640252c19
commit 75f7046893
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
images/pgadmin/Dockerfile
View File

@ -9,6 +9,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends git \
&& rm -rf /opt/php/pgadmin/.git \
&& chown -R www-data:www-data /opt/php/pgadmin \
&& apt-get purge -y git \
&& apt-get autoremove -y
&& apt-get autoremove -y \
&& ls -l /opt/php/pgadmin
VOLUME ["/opt/php/pgadmin/conf"]
RUN ls -l /opt/php/pgadmin
# needed for nginx
#VOLUME ["/opt/php/pgadmin/"]

44
setup.sh
View File

@ -148,8 +148,9 @@ cnt_cron="$prefix-cron"
if [[ "$mode" == "" || "$mode" == "--kill" ]]; then
docker kill $cnt_postgres $cnt_nginx_public $cnt_nginx_internal $cnt_phpfpm_frontend $cnt_phpfpm_rest $cnt_phpfpm_pgadmin $cnt_phpfpm_ldapadmin $cnt_cron
docker rm -v $cnt_postgres $cnt_nginx_public $cnt_nginx_internal $cnt_phpfpm_frontend $cnt_phpfpm_rest $cnt_phpfpm_pgadmin $cnt_phpfpm_ldapadmin $cnt_cron
docker stop $cnt_postgres $cnt_nginx_public $cnt_nginx_internal $cnt_phpfpm_frontend $cnt_phpfpm_rest $cnt_pgadmin $cnt_phpfpm_ldapadmin $cnt_cron
docker kill $cnt_postgres $cnt_nginx_public $cnt_nginx_internal $cnt_phpfpm_frontend $cnt_phpfpm_rest $cnt_pgadmin $cnt_phpfpm_ldapadmin $cnt_cron
docker rm -v $cnt_postgres $cnt_nginx_public $cnt_nginx_internal $cnt_phpfpm_frontend $cnt_phpfpm_rest $cnt_pgadmin $cnt_phpfpm_ldapadmin $cnt_cron
fi
@ -167,25 +168,6 @@ if [[ "$mode" == "" || "$mode" == "--run" ]]; then
--name $cnt_postgres \
$img_postgres
# czas na nginxy
# - publiczny
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/php-fpm/":/var/run/php-fpm/ \
-v "$static_data_dir/data/php-fpm/":/opt/php/ \
--name $cnt_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/php-fpm/":/var/run/php-fpm/ \
-v "$static_data_dir/data/php-fpm/":/opt/php/ \
--name $cnt_nginx_internal \
$img_nginx
# a teraz php-fpmy!
# - frontend
docker run -d \
@ -225,6 +207,26 @@ if [[ "$mode" == "" || "$mode" == "--run" ]]; then
# --name $cnt_phpfpm_ldapadmin \
# $img_phpfpm
# czas na nginxy
# - publiczny
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/php-fpm/":/var/run/php-fpm/ \
-v "$static_data_dir/data/php-fpm/":/opt/php/ \
--name $cnt_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/php-fpm/":/var/run/php-fpm/ \
-v "$static_data_dir/data/php-fpm/":/opt/php/ \
--volumes-from $cnt_pgadmin \
--name $cnt_nginx_internal \
$img_nginx
# - cron
# czy powinien mieć dostęp do db i ldapa?
docker run -d \