diff --git a/.env.example b/.env.example index e17a4a5..f9b18d8 100644 --- a/.env.example +++ b/.env.example @@ -14,7 +14,7 @@ TYPESENSE_API_KEY= #Mettre à 1 quand vous êtes en développement et à rien en production DEV= -FORCE_CLONE= +FORCE_CLONE=false USER_ID=1000 GROUP_ID=1000 \ No newline at end of file diff --git a/docker/frontend/entrypoint.sh b/docker/frontend/entrypoint.sh index 70e72fd..c288378 100644 --- a/docker/frontend/entrypoint.sh +++ b/docker/frontend/entrypoint.sh @@ -1,8 +1,6 @@ #!/bin/sh set -e - -echo "ca" FRONTEND_DIR=/app APP_DIR=/var/www/app PUBLIC_DIR="$APP_DIR/public" @@ -13,15 +11,11 @@ WAITED=0 while [ ! -f "$APP_DIR/composer.json" ] || [ ! -d "$APP_DIR/vendor" ] || [ ! -f "$APP_DIR/public/index.php" ]; do if [ $WAITED -ge $MAX_WAIT ]; then exit 1 - echo "je sais pas ce que c" fi sleep 3 WAITED=$((WAITED + 3)) - echo "sleep" done -echo "c bon" - if [ ! -d "$FRONTEND_DIR/.git" ]; then git clone -b "${FRONTEND_GIT_BRANCH:-main}" "$GIT_URL" "$FRONTEND_DIR" diff --git a/docker/php/scripts/init-dev.sh b/docker/php/scripts/init-dev.sh index c561f12..6a1fa17 100644 --- a/docker/php/scripts/init-dev.sh +++ b/docker/php/scripts/init-dev.sh @@ -44,7 +44,7 @@ mkdir -p /var/www/.composer/cache chown -R www-data:www-data /var/www/.composer if [ -f composer.json ]; then - gosu www-data composer update --no-interaction --prefer-dist --optimize-autoloader + gosu www-data composer install --no-interaction --prefer-dist fi cp /tmp/app.env .env diff --git a/docker/php/scripts/init-prod.sh b/docker/php/scripts/init-prod.sh index 2bae045..5bf7ed2 100644 --- a/docker/php/scripts/init-prod.sh +++ b/docker/php/scripts/init-prod.sh @@ -41,8 +41,7 @@ mkdir -p /var/www/.composer/cache chown -R www-data:www-data /var/www/.composer if [ -f composer.json ]; then - composer install --no-interaction --prefer-dist --optimize-autoloader --no-dev -fi + composer install --no-interaction --prefer-dist cp /tmp/app.env .env chown www-data:www-data .env