diff --git a/docker-compose.yml b/docker-compose.yml index 2600eae..ce7de3a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,13 +13,18 @@ services: environment: REPO_URL: ${REPO_URL} BRANCH: ${REPO_BRANCH:-main} + DB_HOST: mariadb + DB_PORT: 3306 APP_NAME: ${APP_NAME} APP_URL: ${APP_URL} NGINX_HOST: ${APP_DOMAIN} NGINX_PORT: ${APP_PORT:-80} networks: + - mariadb_internal - app_network networks: + mariadb_internal: + external: true app_network: driver: bridge \ No newline at end of file diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 6695906..617332b 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -23,6 +23,8 @@ cd "$TARGET_DIR" update_env() { local k=$1 v=$2; grep -q "^$k=" .env && sed -i "s|^$k=.*|$k=$v|" .env || echo "$k=$v" >> .env; } update_env APP_NAME "$APP_NAME" update_env APP_URL "${APP_URL%/}" +update_env DB_HOST "$DB_HOST" +update_env DB_PORT "$DB_PORT" php artisan key:generate --force php artisan migrate --force