diff --git a/.env.example b/.env.example index dc30c2f..cfb9f9e 100644 --- a/.env.example +++ b/.env.example @@ -13,3 +13,5 @@ DB_USERNAME=root DB_PASSWORD= GITPOD_VITE_URL= + +APP_SERVICE=webapp diff --git a/.env.gitpod b/.env.gitpod new file mode 100644 index 0000000..25e7cf6 --- /dev/null +++ b/.env.gitpod @@ -0,0 +1,19 @@ +APP_NAME=devPT +APP_ENV=local +APP_KEY= +APP_DEBUG=true +APP_URL=http://localhost +APP_PORT=8080 + +DB_CONNECTION=pgsql +DB_HOST=postgres +DB_PORT=5432 +DB_DATABASE=laravel +DB_USERNAME=root +DB_PASSWORD= + +GITPOD_VITE_URL= + +APP_SERVICE=webapp +USERID= +GROUPID= diff --git a/.gitpod.yml b/.gitpod.yml index f6f673c..82dcc02 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -10,25 +10,26 @@ tasks: - name: Setup Sail environment init: | - cp .env.example .env - sed -i "s#APP_URL=http://localhost#APP_URL=$(gp url 80)#g" .env - sed -i "s#GITPOD_VITE_URL=#GITPOD_VITE_URL=$(gp url 5174)#g" .env + cp .env.gitpod .env + sed -i "s#APP_URL=http://localhost#APP_URL=$(gp url 8080)#g" .env + sed -i "s#GITPOD_VITE_URL=#GITPOD_VITE_URL=$(gp url 5173)#g" .env + sed -i "s#USERID=#USERID=$(id -u)#g" .env + sed -i "s#GROUPID=#GROUPID=$(id -g)#g" .env - name: Execute Laravel Sail command: > gp sync-await composer-dependencies && docker-compose up -d && - docker-compose exec app bash -c "php artisan key:generate && php artisan storage:link" && + docker-compose exec webapp bash -c "php artisan key:generate && php artisan storage:link" && gp sync-done sail-up - name: Get composer deps command: > gp sync-await sail-up && - npm install && - npm run dev + docker-compose exec webapp bash -c "npm install && npm run dev" ports: - - port: 5174 + - port: 5173 onOpen: ignore visibility: public name: Vite Server diff --git a/package-lock.json b/package-lock.json index 3fe3da4..2a3d4fe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,7 @@ "requires": true, "packages": { "": { + "name": "devpt", "dependencies": { "@vueuse/core": "^9.12.0", "daisyui": "^2.46.0",