diff --git a/docker/webapp/init.sh b/docker/webapp/init.sh index 03bf3377..13098292 100755 --- a/docker/webapp/init.sh +++ b/docker/webapp/init.sh @@ -1,100 +1,94 @@ #!/bin/bash set -e set -x cd /opt/app-root/src/ /update.sh -# If we want to rely on the environment for configuration -if [[ $NOENVFILE == true ]]; then - echo "----> removing envfile" - rm -f .env -fi - if [ ! -f 'resources/countries.php' ]; then echo "----> Importing countries" ./artisan data:countries fi echo "----> Waiting for db" ./artisan db:ping --wait # Import the service ca on openshift update-ca-trust function is_not_initialized() { ROWCOUNT=$(echo "select count(*) from migrations;" | mysql -N -b -u "$DB_USERNAME" -p"$DB_PASSWORD" -h "$DB_HOST" "$DB_DATABASE") if [[ "$ROWCOUNT" == "" ]]; then # Treat an error in the above command as uninitialized ROWCOUNT="0" fi [[ "$ROWCOUNT" == "0" ]] } case ${KOLAB_ROLE} in seed|SEED) echo "----> Running seeder" # Only run the seeder if we haven't even migrated yet. if is_not_initialized; then echo "----> Seeding the database" # If we seed, we always drop all existing tables php -dmemory_limit=512M ./artisan migrate:fresh --seed --force fi ;; horizon|HORIZON) echo "----> Waiting for database to be seeded" while is_not_initialized; do sleep 1 echo "." done echo "----> Running migrations" php -dmemory_limit=512M ./artisan migrate --force || : echo "----> Starting horizon" exec ./artisan horizon ;; octane|OCTANE) echo "----> Running octane" echo "----> Waiting for database to be seeded" while is_not_initialized; do sleep 1 echo "." done exec ./artisan octane:start --host=0.0.0.0 ;; worker|WORKER ) ./artisan migrate --force || : echo "----> Running worker" exec ./artisan queue:work ;; combined|COMBINED ) # If there is no db at all then listing users will crash (resulting in us counting the lines of backtrace), # but migrate:status will just fail. if is_not_initialized; then echo "----> Seeding the database" php -dmemory_limit=512M ./artisan migrate --seed # If there is a db but no user we reseed elif test "$( env APP_DEBUG=false ./artisan -n users | wc -l )" -lt "1"; then echo "----> Initializing the database" php -dmemory_limit=512M ./artisan migrate:refresh --seed # Otherwise we just migrate else echo "----> Running migrations" php -dmemory_limit=512M ./artisan migrate --force fi nohup ./artisan horizon 2>&1 & exec ./artisan octane:start --host=$(env | grep OCTANE_HTTP_HOST | tail -n1 | sed "s/OCTANE_HTTP_HOST=//") ;; * ) echo "----> Sleeping" exec sleep 10000 ;; esac diff --git a/docker/webapp/update-source.sh b/docker/webapp/update-source.sh index ed25b307..7be38735 100755 --- a/docker/webapp/update-source.sh +++ b/docker/webapp/update-source.sh @@ -1,12 +1,13 @@ #!/bin/bash rsync -av \ --exclude=vendor \ --exclude=composer.lock \ --exclude=node_modules \ --exclude=package-lock.json \ --exclude=public \ --exclude=storage \ --exclude=resources/build \ --exclude=.gitignore \ + --exclude=.env \ /src/kolabsrc.orig/ /opt/app-root/src/ | tee /tmp/rsync.output diff --git a/docker/webapp/update.sh b/docker/webapp/update.sh index f071be87..9d2fc0db 100755 --- a/docker/webapp/update.sh +++ b/docker/webapp/update.sh @@ -1,57 +1,63 @@ #!/bin/bash set -e set -x REBUILD=false # Update the sourcecode if available. # This also copies the .env files that is required if we don't provide # a configuration via the environment. # So we need this for the podman setup if [ -d /src/kolabsrc.orig ]; then echo "----> Updating source" /update-source.sh REBUILD=true fi if [ -d /src/overlay ]; then echo "----> Applying overlay" rsync -av \ --exclude=vendor \ --exclude=composer.lock \ --exclude=node_modules \ --exclude=package-lock.json \ --exclude=public \ --exclude=storage \ --exclude=resources/build \ --exclude=bootstrap \ --exclude=.gitignore \ + --exclude=.env \ /src/overlay/ /opt/app-root/src/ | tee /tmp/rsync-overlay.output REBUILD=true fi cd /opt/app-root/src/ +# We rely on the environment for configuration +# We have to do this before running composer, because that attempts to read the .env file too. +rm -f .env + + if [[ $REBUILD == true ]]; then rm -rf storage/framework mkdir -p storage/framework/{sessions,views,cache} if grep -e "composer.json" -e "app" /tmp/rsync.output; then rm composer.lock # Must be before the first artisan command because those can fail otherwise) php -dmemory_limit=-1 $(command -v composer) install fi find bootstrap/cache/ -type f ! -name ".gitignore" -delete ./artisan clear-compiled ./artisan cache:clear # Only run npm if something relevant was updated if grep -e "package.json" -e "resources" /tmp/rsync.output; then npm run dev fi # Can fail if octane is not running ./artisan octane:reload || : fi