diff --git a/.env.example b/.env.example deleted file mode 100644 index cf1f8b3..0000000 --- a/.env.example +++ /dev/null @@ -1,25 +0,0 @@ -# the laravel version to install (empty for latest) -LARAVEL_VERSION= - -# weather to run "npm dev" at boot -BOOT_NPM_DEV=true - -# runs npm install at boot -BOOT_NPM_INSTALL=true - -# runs composer install at boot -BOOT_COMPOSER_INSTALL=true - -# external ports -FORWARD_LARAVEL_PORT=80 -FORWARD_VITE_PORT=5173 -FORWARD_DB_PORT=3306 -FORWARD_REDIS_PORT=6379 -FORWARD_MAILPIT_PORT=1025 -FORWARD_MAILPIT_DASHBOARD_PORT=8025 - -# DB settings (this will overwrite the defaults in the laravel project) -DB_PORT=3306 -DB_DATABASE=laravel -DB_USERNAME=laravel -DB_PASSWORD=password diff --git a/docker-compose.yml b/docker-compose.yml index d610b78..ce008c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,20 +1,21 @@ version: '3' services: app: - build: - context: build - dockerfile: Dockerfile - image: laravel + image: vistanarvas/simple-laravel ports: - - '${FORWARD_LARAVEL_PORT:-80}:8080' - - '${FORWARD_VITE_PORT:-5173}:5173' + - '8080:80' + - '5173:5173' environment: - LARAVEL_VERSION: '${LARAVEL_VERSION}' - AUTO_START_NPM_DEV: '${AUTO_START_NPM_DEV:-false}' - DB_HOST: mysql + WEBSERVER_PORT: 80 DB_CONNECTION: mysql - env_file: - .env + DB_HOST: mysql + DB_PORT: 3306 + DB_DATABASE: laravel + DB_USERNAME: laravel + DB_PASSWORD: password + BOOT_NPM_DEV: true # also starts `npm dev` + BOOT_NPM_INSTALL: true # runs `npm install` on boot + BOOT_COMPOSER_INSTALL: true # runs `composer install` on boot depends_on: - mysql - redis @@ -23,7 +24,7 @@ services: mysql: image: 'mysql/mysql-server:8.0' ports: - - '${FORWARD_DB_PORT:-3306}:3306' + - '3306:3306' environment: MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}' MYSQL_ROOT_HOST: '%' @@ -37,15 +38,15 @@ services: redis: image: 'redis:alpine' ports: - - '${FORWARD_REDIS_PORT:-6379}:6379' + - '6379:6379' volumes: - 'redis:/data' mailpit: image: 'axllent/mailpit:latest' ports: - - '${FORWARD_MAILPIT_PORT:-1025}:1025' - - '${FORWARD_MAILPIT_DASHBOARD_PORT:-8025}:8025' + - '1025:1025' + - '8025:8025' volumes: mysql: