diff --git a/.gitignore b/.gitignore index 1bea42a..e17f8f2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ yarn-error.log /.fleet /.idea /.vscode +/docker/keys.env \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index c038480..f1ef675 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,14 @@ services: - hts-appteam-local-dev ports: - "9000:9000" + env_file: + - docker/keys.env + environment: + VIRTUAL_HOST: openshift.docker.dev + VIRTUAL_PROTO: https + VIRTUAL_PORT: 443 + DUSK_DRIVER_URL: http://seleniarm.docker.dev:4444/wd/hub + DUSK_START_MAXIMIZED: true frontend: container_name: openshift_frontend build: diff --git a/docker/backend-entrypoint.sh b/docker/backend-entrypoint.sh index ed4cdf1..82be4b1 100644 --- a/docker/backend-entrypoint.sh +++ b/docker/backend-entrypoint.sh @@ -4,4 +4,10 @@ echo " ⭐️️️️️⭐️️️️️⭐️️️️️⭐️ VERSIE: 1 " echo "⭐️ Run artisan migrate"; php artisan migrate --seed +echo "⭐️ Set folder access"; +chmod a+w -R /var/www/bootstrap/cache +chmod a+w -R /var/www/public +chmod a+w -R /var/www/vendor +chmod a+w -R /var/www/storage + php-fpm \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 98364b1..b3b40cf 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -17,13 +17,7 @@ - - - - - {{-- --}} - diff --git a/vite.config.js b/vite.config.js index 8f5d603..a75502d 100644 --- a/vite.config.js +++ b/vite.config.js @@ -35,22 +35,22 @@ export default defineConfig({ '~bootstrap': path.resolve(__dirname, 'node_modules/bootstrap'), } }, - server: { - port: 8080, - hmr: { - host: 'localhost', - }, - }, // server: { - // https: { - // key: fs.readFileSync('docker/certificates/docker.dev.key'), - // cert: fs.readFileSync('docker/certificates/docker.dev.crt'), - // }, - // host: true, - // port: `${port}`, + // port: 8080, // hmr: { - // host: `${host}`, - // protocol: 'wss' + // host: 'localhost', // }, // }, + server: { + https: { + key: fs.readFileSync('docker/certificates/docker.dev.key'), + cert: fs.readFileSync('docker/certificates/docker.dev.crt'), + }, + host: true, + port: 7050, + hmr: { + host: 'openshift.docker.dev', + protocol: 'wss' + }, + }, });