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

drobne poprawki w odniesieniu do crona

master
Michał 'rysiek' Woźniak 2015-01-06 03:32:21 +01:00
parent 7d7c278e75
commit bd3a7d80a2
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
images/cron/Dockerfile
View File

@ -30,9 +30,6 @@ VOLUME ["/etc/cron.d", "/etc/cron.daily", "/etc/cron.hourly", "/etc/cron.monthly
# well
WORKDIR /etc
# ports
EXPOSE 80 443
# command and entrypoint
CMD []
ENTRYPOINT ["/usr/sbin/cron", "-f"]

51
setup.sh
View File

@ -5,11 +5,36 @@
# konfiguracja
static_data_dir="/opt/hangar18"
mode=""
# jeśli mamy 2 argumenty, pierwszy to switch, drugi to katalog
# jeśli tylko jeden -- albo jedno, albo drugie, trzeba rozpoznać po '--' na początku
if [[ "$1" != "" ]]; then
static_data_dir="$1"
# mamy drugi argument?
if [[ "$2" != "" ]]; then
# przypisujemy
static_data_dir="$2"
mode="$1"
# reality checks
if [[ "${static_data_dir:0:2}" == "--" ]]; then
echo "to nie wygląda na katalog: $static_data_dir"
exit 1
fi
if [[ "${mode:0:2}" != "--" ]]; then
echo "to nie wygląda na tryb pracy: $mode"
exit 1
fi
# z czym mamy do czynienia?
elif [[ "${1:0:2}" == "--" ]]; then
# znaczy, tryb!
mode="$1"
else
# znaczy, katalog!
static_data_dir="$1"
fi
fi
# prefix obrazów, kontenerów, ...
@ -20,7 +45,7 @@ prefix="plug"
#
# czy budujemy?
if [[ "$1" == "" || "$1" == "--build" ]]; then
if [[ "$mode" == "" || "$mode" == "--build" ]]; then
# katalog obecny
startdir=`pwd`
@ -44,7 +69,7 @@ fi
# katalog konfiguracji, danych, i tak dalej
#
if [[ "$1" == "" || "$1" == "--populate-static-data" ]]; then
if [[ "$mode" == "" || "$mode" == "--populate-static-data" ]]; then
# potrzebujemy sudo
echo "By jechać dalej, potrzebujemy sudo. To ja poproszę..."
@ -71,12 +96,12 @@ if [[ "$1" == "" || "$1" == "--populate-static-data" ]]; then
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"
sudo mkdir "$static_data_dir/cron"
sudo mkdir "$static_data_dir/cron/d"
sudo mkdir "$static_data_dir/cron/daily"
sudo mkdir "$static_data_dir/cron/weekly"
sudo mkdir "$static_data_dir/cron/hourly"
sudo mkdir "$static_data_dir/cron/monthly"
sudo mkdir "$static_data_dir/data/cron"
sudo mkdir "$static_data_dir/data/cron/d"
sudo mkdir "$static_data_dir/data/cron/daily"
sudo mkdir "$static_data_dir/data/cron/weekly"
sudo mkdir "$static_data_dir/data/cron/hourly"
sudo mkdir "$static_data_dir/data/cron/monthly"
sudo rsync -av static_data/data/ "$static_data_dir/data/"
# configs if needed
@ -121,10 +146,10 @@ cnt_cron="$prefix-cron"
# czyścimy
#
if [[ "$1" == "" || "$1" == "--kill" ]]; then
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
docker rm -v $cnt_postgres $cnt_nginx_public $cnt_nginx_internal $cnt_phpfpm_frontend $cnt_phpfpm_rest $cnt_phpfpm_pgadmin $cnt_phpfpm_ldapadmin
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
fi
@ -132,7 +157,7 @@ fi
# odpalamy kolejno dockery
#
if [[ "$1" == "" || "$1" == "--run" ]]; then
if [[ "$mode" == "" || "$mode" == "--run" ]]; then
set -x