diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore old mode 100644 new mode 100755 diff --git a/docker-compose.yml b/docker-compose.yml index e67aa72..d372505 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,9 @@ services: build: context: . dockerfile: docker/app/Dockerfile + args: + UID: 1000 + GID: 1000 volumes: - .:/var/www/html - app_storage:/var/www/html/storage/app @@ -31,6 +34,9 @@ services: build: context: . dockerfile: docker/app/Dockerfile + args: + UID: 1000 + GID: 1000 command: php artisan queue:work --sleep=3 --tries=3 volumes: - .:/var/www/html @@ -48,6 +54,9 @@ services: build: context: . dockerfile: docker/app/Dockerfile + args: + UID: 1000 + GID: 1000 command: sh -c "while true; do php artisan schedule:run --verbose --no-interaction; sleep 60; done" volumes: - .:/var/www/html @@ -65,6 +74,9 @@ services: build: context: . dockerfile: docker/app/Dockerfile + args: + UID: 1000 + GID: 1000 command: php artisan reverb:start --host=0.0.0.0 --port=8081 ports: - "8080:8081" diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile index 1426d18..ac13f94 100644 --- a/docker/app/Dockerfile +++ b/docker/app/Dockerfile @@ -12,9 +12,24 @@ RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \ && apt-get install -y nodejs \ && apt-get clean && rm -rf /var/lib/apt/lists/* -RUN usermod -u 1000 www-data && groupmod -g 1000 www-data +ARG UID=1000 +ARG GID=1000 + +RUN groupadd -g ${GID} app \ + && useradd -u ${UID} -g app -m -s /bin/bash app WORKDIR /var/www/html COPY . . -RUN composer install --no-dev --optimize-autoloader \ - && chown -R www-data:www-data storage bootstrap/cache +RUN composer install --no-dev --optimize-autoloader + +RUN mkdir -p /var/www/html/storage/logs \ + /var/www/html/storage/framework/cache \ + /var/www/html/storage/framework/sessions \ + /var/www/html/storage/framework/views \ + /var/www/html/storage/app/public \ + /var/www/html/storage/app/uploads \ + /var/www/html/bootstrap/cache \ + && chown -R app:app /var/www/html/storage /var/www/html/bootstrap/cache \ + && chmod -R 775 /var/www/html/storage /var/www/html/bootstrap/cache + +USER app diff --git a/package-lock.json b/package-lock.json index c7d2ab6..59d38c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "html", + "name": "lernschiff", "lockfileVersion": 3, "requires": true, "packages": { @@ -3401,9 +3401,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.360", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.360.tgz", - "integrity": "sha512-GkcBt6YYAw9SxFWn+xVar4cLVGlXVuswwtRLBozi2zp0GjXs4ZnOrqV4zbXzg35n7w81hCkyJNYicgXlVHAmBA==", + "version": "1.5.361", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.361.tgz", + "integrity": "sha512-Q6Hts7N9FnJc5LeGRINFvLhCI9xZmNtTDe5ZbcVezQz7cU4a8Aua3GH1b8J2XY8Al9PF+OCwYqhgsOOheMdvkA==", "dev": true, "license": "ISC" }, @@ -3415,9 +3415,9 @@ "license": "MIT" }, "node_modules/enhanced-resolve": { - "version": "5.21.6", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.6.tgz", - "integrity": "sha512-aNnGCvbJ/RIyWo1IuhNdVjnNF+EjH9wpzpNHt+ci/m9He9LJvUN8wrCcXjp9cWsGNAuvSpVFTx/vraAFQ8qGjQ==", + "version": "5.22.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.22.0.tgz", + "integrity": "sha512-xYcDWrpELkFzz9SpZ3PlI6Eu6eD93Yf0WLDRxikGhWJ3MAir2SNZTIVCVZqZ/NUyx8AdMc2gT9C0gPiw18kG+A==", "dev": true, "license": "MIT", "dependencies": { @@ -4995,9 +4995,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.45", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.45.tgz", - "integrity": "sha512-iIbHXV9eBB2nB0wa7oTsrrXq+qQt+9SIlx9AX3T96YgobtEQfis5n6TJ6vV+3QP8DwdriEAcGhARaFCu37peBg==", + "version": "2.0.46", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.46.tgz", + "integrity": "sha512-GYVXHE2KnrzAfsAjl4uP++evGFCrAU1jta4ubEjIG7YWt/64Gqv66a30yKwWczVjA6j3bM4nBwH7Pk1JmDHaxQ==", "dev": true, "license": "MIT", "engines": { diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 0464add..f76f4c9 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -6,14 +6,10 @@ Laravel - - - - @vite(['resources/css/app.css', 'resources/js/app.js']) - +
diff --git a/storage/app/.gitignore b/storage/app/.gitignore old mode 100644 new mode 100755 diff --git a/storage/app/private/.gitignore b/storage/app/private/.gitignore old mode 100644 new mode 100755 diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/testing/.gitignore b/storage/framework/testing/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore old mode 100644 new mode 100755 diff --git a/tailwind.config.js b/tailwind.config.js deleted file mode 100644 index c29eb1a..0000000 --- a/tailwind.config.js +++ /dev/null @@ -1,21 +0,0 @@ -import defaultTheme from 'tailwindcss/defaultTheme'; -import forms from '@tailwindcss/forms'; - -/** @type {import('tailwindcss').Config} */ -export default { - content: [ - './vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php', - './storage/framework/views/*.php', - './resources/views/**/*.blade.php', - ], - - theme: { - extend: { - fontFamily: { - sans: ['Figtree', ...defaultTheme.fontFamily.sans], - }, - }, - }, - - plugins: [forms], -};