mti
/
ptut-virtenv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

+fix ter now updates 'chown' on php-fpm container #2

This commit is contained in:
xdrm-brackets 2018-02-19 22:02:07 +01:00
parent 62341c48c8
commit deef823876
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
metactl/ci/web.sh
View File

@ -32,8 +32,6 @@ while true; do
# N. Recreate trigger # N. Recreate trigger
test ! -f $TRIGGER && touch $TRIGGER; test ! -f $TRIGGER && touch $TRIGGER;
chgrp 33 $TRIGGER;
chmod 775 $TRIGGER;
sleep 1; sleep 1;

17
metactl/post-start.sh
View File

@ -30,7 +30,9 @@ echo "ready";
## [1] Restore database
## [2] Restore database
# 1. Check if dump file exists # 1. Check if dump file exists
echo -ne " * Check dump file..........."; echo -ne " * Check dump file...........";
@ -50,9 +52,6 @@ else
ec @echo -n "*** Create trigger............."; ec @echo -n "*** Create trigger.............";
@test ! -d ./virtual/ci && mkdir ./virtual/ci; (exit 0); @test ! -d ./virtual/ci && mkdir ./virtual/ci; (exit 0);
@chmod 777 ./virtual/ci; (exit 0);
@touch ./virtual/ci/trigger; echo "done";
@chmod 777 ./virtual/ci/trigger; (exit 0);ho "missing";
# Create 'persistent' directory if missing # Create 'persistent' directory if missing
test ! -d $ROOT/persistent && mkdir -p $ROOT/persistent; test ! -d $ROOT/persistent && mkdir -p $ROOT/persistent;
@ -61,4 +60,12 @@ else
touch $MARIADB_DUMP; touch $MARIADB_DUMP;
fi; fi;
## [3] Grant www-data for CI triggers
echo -n " * Grant php on triggers.....";
docker exec php-fpm chown www-data -R /ci && echo "granted" || (echo "failed"; exit 1);

4
metactl/pre-start.sh
View File

@ -16,14 +16,10 @@ chmod o=rx `dirname $ROOT`/virtual/ci;
# 2. Create 'env' trigger # 2. Create 'env' trigger
echo -ne " * Create 'env' trigger......"; echo -ne " * Create 'env' trigger......";
test ! -f `dirname $ROOT`/virtual/ci/env && ( touch `dirname $ROOT`/virtual/ci/env && echo "created" || (echo "failed"; exit 1)) || echo "already"; test ! -f `dirname $ROOT`/virtual/ci/env && ( touch `dirname $ROOT`/virtual/ci/env && echo "created" || (echo "failed"; exit 1)) || echo "already";
chgrp 33 `dirname $ROOT`/virtual/ci/env;
chmod 775 `dirname $ROOT`/virtual/ci/env;
# 3. Create 'web' trigger # 3. Create 'web' trigger
echo -ne " * Create 'web' trigger......"; echo -ne " * Create 'web' trigger......";
test ! -f `dirname $ROOT`/virtual/ci/web && ( touch `dirname $ROOT`/virtual/ci/web && echo "created" || (echo "failed"; exit 1)) || echo "already"; test ! -f `dirname $ROOT`/virtual/ci/web && ( touch `dirname $ROOT`/virtual/ci/web && echo "created" || (echo "failed"; exit 1)) || echo "already";
chgrp 33 `dirname $ROOT`/virtual/ci/web;
chmod 775 `dirname $ROOT`/virtual/ci/web;
# 3. Create 'env' spy # 3. Create 'env' spy
echo -ne " * Launch 'env' spy.........."; echo -ne " * Launch 'env' spy..........";