diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9d757f8..1875e13 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -19,10 +19,7 @@ } }, "remoteUser": "sail", - "postCreateCommand": "bash .devcontainer/postCreateCommand.sh", - "forwardPorts": [ - 8081 - ] + "postCreateCommand": "bash .devcontainer/postCreateCommand.sh" // "runServices": [], // "shutdownAction": "none", } diff --git a/.env.example b/.env.example index 9662440..88e74d8 100644 --- a/.env.example +++ b/.env.example @@ -7,7 +7,7 @@ APP_ENV=local APP_KEY= APP_DEBUG=false APP_URL=http://127.0.0.1 -APP_PORT=80 +APP_PORT=8080 APP_SERVICE=app APP_TIMEZONE=UTC diff --git a/docker-compose.yml b/docker-compose.yml index dfb3aa1..b1ff2d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -82,7 +82,8 @@ services: ports: - '8081:80' environment: - PMA_HOST: db + PBA_HOST: db + PMA_PORT: '${FORWARD_DB_PORT:-3306}:3306' MYSQL_ROOT_PASSWORD: '${DB_PASSWORD:-kcal}' networks: - sail