From dcc6126e5a764e9a6ba148ea0a90cfe43c58d593 Mon Sep 17 00:00:00 2001 From: emrullahardc Date: Tue, 13 Jun 2023 01:20:33 +0300 Subject: [PATCH 1/3] Update docker-compose.yml --- docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a397e0c6f..3b8162cda 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,8 +35,6 @@ services: depends_on: database: condition: service_healthy - env_file: .env - # Database Server database: @@ -59,4 +57,4 @@ services: retries: 10 volumes: - db-data: ~ \ No newline at end of file + db-data: ~ From d95bd3bf4d75e0ee15366fd4fa0ed6b963282627 Mon Sep 17 00:00:00 2001 From: emrullahardc Date: Tue, 13 Jun 2023 01:21:01 +0300 Subject: [PATCH 2/3] Update install.sh --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index c669fecd0..65ef9c80d 100644 --- a/install.sh +++ b/install.sh @@ -38,7 +38,7 @@ if [[ $(which docker) && $(docker --version) ]]; then fi fi -cp -u .env-sail .env +cp .env-sail .env docker compose down -v @@ -52,4 +52,4 @@ docker compose up --force-recreate #php artisan migrate --all-addons --force #composer config http-basic.abc.aaa.com openclassify pass -#composer config repositories.repo-name composer https://abc.aaa.com \ No newline at end of file +#composer config repositories.repo-name composer https://abc.aaa.com From 1f647857197d30b7feb34d358c411d94dcf42b3d Mon Sep 17 00:00:00 2001 From: emrullahardc Date: Tue, 13 Jun 2023 01:21:28 +0300 Subject: [PATCH 3/3] Update entrypoint.sh --- docker/entrypoint.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 0b1f9ad6a..309e069ba 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -19,10 +19,8 @@ fi role=${CONTAINER_ROLE:-app} if [ "$role" = "app" ]; then - if [ "$INSTALLED" = "false" ]; then echo ".env installed is false starting installing" php artisan install --ready - fi exec docker-php-entrypoint "$@" elif [ "$role" = "queue" ]; then echo "Running the queue ... " @@ -30,4 +28,4 @@ elif [ "$role" = "queue" ]; then elif [ "$role" = "websocket" ]; then echo "Running the websocket server ... " php artisan websockets:serve -fi \ No newline at end of file +fi