Skip to content

A self-hosted media server and file management system

Some working docker setup but its incomplete by far

aminnausin8e5debc87fb8
diff --git a/.dockerignore b/.dockerignore
index 0bb2eba7..aaf218b7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,39 +1,31 @@
+/.vite/*
+/.vscode
/.phpunit.cache
-/node_modules
/public/build
/public/hot
/public/storage
/storage/*.key
/storage/pail
+/storage/app/public/*
+/storage/debugbar/
+/storage/logs/
+/bootstrap/cache/*
/vendor
+/node_modules
.env
.env.backup
.env.production
.phpactor.json
.phpunit.result.cache
-Homestead.json
-Homestead.yaml
-auth.json
-npm-debug.log
-yarn-error.log
-/.fleet
-/.idea
-/.nova
-/.vscode
-/.zed
+.prettierignore
+.prettierrc.json
+.editorconfig
+.dockerignore
+.gitignore
+.git
-/media/*
-/.vite/*
-storage/app/public/*
-storage/debugbar/*
-storage/framework/*
-storage/logs/*
-/databaseBackups
-/old
-/pulsesrc
+pint.json
+commands.txt
-.git
-.gitignore
-.dockerignore
-Docerfile
+Dockerfile
diff --git a/.gitignore b/.gitignore
index 13af6593..71060506 100755
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ storage/logs/*
/databaseBackups
/old
/pulsesrc
+/data
diff --git a/Dockerfile b/Dockerfile
index be36e358..71199545 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,48 +1,48 @@
-# syntax=docker/dockerfile:1
-
-FROM php:8.4-fpm-alpine
-
-RUN apt-get update && apt-get install -y \
- build-essential \
- libpng-dev \
- libjpeg-dev \
- libwebp-dev \
- libxpm-dev \
- libfreetype6-dev \
- libzip-dev \
- zip \
- unzip \
- git \
- bash \
- fcgiwrap \
- libmcrypt-dev \
- libonig-dev \
- libpq-dev \
- ffmpeg \
- exiftool
-
-# Clear cache
-RUN apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# Install PHP extensions
-RUN docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \
- && docker-php-ext-install gd \
- && docker-php-ext-install pdo pdo_pgsql mbstring zip exif pcntl bcmath opcache
-
-# Install Composer
-COPY --from=composer/composer:latest-bin /composer /usr/bin/composer
-
-# Set working directory
-WORKDIR /var/www
-
-# Copy existing application directory contents
-COPY . /var/www/mediaServer/
-
-# Set ownership and permissions for the /var/www/mediaServer directory to mediaServer
-RUN chown -R mediaServer:mediaServer /var/www/mediaServer/
-
-USER mediaServer
-
-EXPOSE 9000
-
-CMD ["php-fpm"]
+FROM node:22 AS builder
+
+WORKDIR /var/www/html
+
+COPY package.json ./
+COPY package-lock.json ./
+
+RUN npm ci
+
+COPY . .
+
+RUN npm run build-only
+
+FROM jkaninda/nginx-php-fpm:8.3
+
+WORKDIR /var/www/html
+
+COPY . .
+
+RUN composer Install
+RUN chmod o+w ./storage/ -R
+RUN chmod o+w ./public/ -R
+
+RUN cp .env.example .env
+
+RUN php artisan key:generate
+
+RUN php artisan reverb:generate
+
+RUN php artisan storage:link
+
+# RUN php artisan migrate
+
+COPY --from=builder /var/www/html/public/build ./public/build
+
+# Set permissions for the entrypoint script
+
+# RUN cp .env.example .env
+
+# RUN php artisan key:generate
+
+# RUN php artisan reverb:generate
+
+# RUN php artisan storage:link
+
+# RUN php artisan migrate
+
+ENV DOCUMENT_ROOT=/var/www/html/public
diff --git a/Dockerfile1 b/Dockerfile1
new file mode 100644
index 00000000..7137bcae
--- /dev/null
+++ b/Dockerfile1
@@ -0,0 +1,86 @@
+# syntax=docker/dockerfile:1
+
+FROM php:8.3.16-fpm-alpine
+
+RUN apk update && apk add --no-cache \
+ bash \
+ git \
+ freetype-dev \
+ libjpeg-turbo-dev \
+ libpng-dev \
+ libwebp-dev \
+ libzip-dev \
+ oniguruma-dev \
+ postgresql-dev \
+ nodejs \
+ npm \
+ ffmpeg \
+ exiftool
+
+ # build-base \
+ # libpng-dev \
+ # libjpeg-turbo-dev \
+ # libwebp-dev \
+ # libxpm-dev \
+ # freetype-dev \
+ # libzip-dev \
+ # bash \
+ # fcgiwrap \
+ # oniguruma-dev \
+ # postgresql-dev \
+ # ffmpeg \
+ # exiftool \
+ # git \
+ # zip \
+ # unzip \
+ # nodejs \
+ # npm
+
+# Install PHP extensions
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \
+ && docker-php-ext-install gd \
+ && docker-php-ext-install pdo pdo_pgsql mbstring zip exif pcntl bcmath opcache
+
+# Install Composer
+COPY --from=composer/composer:latest-bin /composer /usr/bin/composer
+
+RUN echo "error_reporting = E_ALL & ~E_NOTICE & ~E_DEPRECATED" > /usr/local/etc/php/conf.d/error_reporting.ini
+
+# Copy existing application directory contents
+COPY . /var/www/html/
+
+# Set working directory
+WORKDIR /var/www/html/
+
+RUN mkdir -p /var/www/html/storage/framework/{sessions,views,cache} && \
+ chown -R www-data:www-data /var/www/html/storage/framework && \
+ chmod -R 775 /var/www/html/storage/framework
+
+RUN npm i && \
+ npm run build-only && \
+ npm cache clean --force && \
+ rm -rf /root/.npm && \
+ rm -rf node_modules
+RUN composer install --no-dev --optimize-autoloader --no-interaction --no-scripts --no-progress
+
+USER root
+
+# Copy entrypoint script
+COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+
+# Set permissions for the entrypoint script
+RUN chmod +x /usr/local/bin/entrypoint.sh
+
+# Set ownership and permissions for the /var/www/mediaServer directory to mediaServer
+RUN chmod -R 755 /var/www/html/
+RUN chown -R www-data:www-data /var/www/
+
+RUN chown -R www-data:www-data /var/www/html/
+
+USER www-data
+
+EXPOSE 9000
+
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+
+CMD ["php-fpm"]
diff --git a/composer.lock b/composer.lock
index 2246a539..20027b63 100755
--- a/composer.lock
+++ b/composer.lock
@@ -199,26 +199,26 @@
},
{
"name": "clue/redis-react",
- "version": "v2.7.0",
+ "version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/clue/reactphp-redis.git",
- "reference": "2283690f249e8d93342dd63b5285732d2654e077"
+ "reference": "84569198dfd5564977d2ae6a32de4beb5a24bdca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/clue/reactphp-redis/zipball/2283690f249e8d93342dd63b5285732d2654e077",
- "reference": "2283690f249e8d93342dd63b5285732d2654e077",
+ "url": "https://api.github.com/repos/clue/reactphp-redis/zipball/84569198dfd5564977d2ae6a32de4beb5a24bdca",
+ "reference": "84569198dfd5564977d2ae6a32de4beb5a24bdca",
"shasum": ""
},
"require": {
- "clue/redis-protocol": "0.3.*",
+ "clue/redis-protocol": "^0.3.2",
"evenement/evenement": "^3.0 || ^2.0 || ^1.0",
"php": ">=5.3",
"react/event-loop": "^1.2",
- "react/promise": "^3 || ^2.0 || ^1.1",
- "react/promise-timer": "^1.9",
- "react/socket": "^1.12"
+ "react/promise": "^3.2 || ^2.0 || ^1.1",
+ "react/promise-timer": "^1.11",
+ "react/socket": "^1.16"
},
"require-dev": {
"clue/block-react": "^1.5",
@@ -251,7 +251,7 @@
],
"support": {
"issues": "https://github.com/clue/reactphp-redis/issues",
- "source": "https://github.com/clue/reactphp-redis/tree/v2.7.0"
+ "source": "https://github.com/clue/reactphp-redis/tree/v2.8.0"
},
"funding": [
{
@@ -263,20 +263,20 @@
"type": "github"
}
],
- "time": "2024-01-05T15:54:20+00:00"
+ "time": "2025-01-03T16:18:33+00:00"
},
{
"name": "dedoc/scramble",
- "version": "v0.11.31",
+ "version": "v0.11.33",
"source": {
"type": "git",
"url": "https://github.com/dedoc/scramble.git",
- "reference": "bd7aeda823765565adc79bbb1a2b7d066b77c318"
+ "reference": "3c44e2ec517045590cb36b165967283fd5798edc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dedoc/scramble/zipball/bd7aeda823765565adc79bbb1a2b7d066b77c318",
- "reference": "bd7aeda823765565adc79bbb1a2b7d066b77c318",
+ "url": "https://api.github.com/repos/dedoc/scramble/zipball/3c44e2ec517045590cb36b165967283fd5798edc",
+ "reference": "3c44e2ec517045590cb36b165967283fd5798edc",
"shasum": ""
},
"require": {
@@ -294,6 +294,7 @@
"pestphp/pest": "^2.34",
"pestphp/pest-plugin-laravel": "^2.3",
"phpunit/phpunit": "^10.5",
+ "spatie/laravel-permission": "^6.10",
"spatie/pest-plugin-snapshots": "^2.1"
},
"type": "library",
@@ -330,7 +331,7 @@
],
"support": {
"issues": "https://github.com/dedoc/scramble/issues",
- "source": "https://github.com/dedoc/scramble/tree/v0.11.31"
+ "source": "https://github.com/dedoc/scramble/tree/v0.11.33"
},
"funding": [
{
@@ -338,7 +339,7 @@
"type": "github"
}
],
- "time": "2024-12-20T10:12:41+00:00"
+ "time": "2025-01-08T07:53:14+00:00"
},
{
"name": "denniseilander/pulse-log-files",
@@ -655,16 +656,16 @@
},
{
"name": "doctrine/sql-formatter",
- "version": "1.5.1",
+ "version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/sql-formatter.git",
- "reference": "b784cbde727cf806721451dde40eff4fec3bbe86"
+ "reference": "d6d00aba6fd2957fe5216fe2b7673e9985db20c8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/b784cbde727cf806721451dde40eff4fec3bbe86",
- "reference": "b784cbde727cf806721451dde40eff4fec3bbe86",
+ "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/d6d00aba6fd2957fe5216fe2b7673e9985db20c8",
+ "reference": "d6d00aba6fd2957fe5216fe2b7673e9985db20c8",
"shasum": ""
},
"require": {
@@ -674,8 +675,7 @@
"doctrine/coding-standard": "^12",
"ergebnis/phpunit-slow-test-detector": "^2.14",
"phpstan/phpstan": "^1.10",
- "phpunit/phpunit": "^10.5",
- "vimeo/psalm": "^5.24"
+ "phpunit/phpunit": "^10.5"
},
"bin": [
"bin/sql-formatter"
@@ -705,9 +705,9 @@
],
"support": {
"issues": "https://github.com/doctrine/sql-formatter/issues",
- "source": "https://github.com/doctrine/sql-formatter/tree/1.5.1"
+ "source": "https://github.com/doctrine/sql-formatter/tree/1.5.2"
},
- "time": "2024-10-21T18:21:57+00:00"
+ "time": "2025-01-24T11:45:48+00:00"
},
{
"name": "dragonmantank/cron-expression",
@@ -1501,16 +1501,16 @@
},
{
"name": "laravel/framework",
- "version": "v11.36.1",
+ "version": "v11.40.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "df06f5163f4550641fdf349ebc04916a61135a64"
+ "reference": "599a28196d284fee158cc10086fd56ac625ad7a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/df06f5163f4550641fdf349ebc04916a61135a64",
- "reference": "df06f5163f4550641fdf349ebc04916a61135a64",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/599a28196d284fee158cc10086fd56ac625ad7a3",
+ "reference": "599a28196d284fee158cc10086fd56ac625ad7a3",
"shasum": ""
},
"require": {
@@ -1536,7 +1536,7 @@
"league/flysystem-local": "^3.25.1",
"league/uri": "^7.5.1",
"monolog/monolog": "^3.0",
- "nesbot/carbon": "^2.72.2|^3.4",
+ "nesbot/carbon": "^2.72.6|^3.8.4",
"nunomaduro/termwind": "^2.0",
"php": "^8.2",
"psr/container": "^1.1.1|^2.0.1",
@@ -1560,7 +1560,6 @@
"voku/portable-ascii": "^2.0.2"
},
"conflict": {
- "mockery/mockery": "1.6.8",
"tightenco/collect": "<5.5.33"
},
"provide": {
@@ -1612,6 +1611,7 @@
"fakerphp/faker": "^1.24",
"guzzlehttp/promises": "^2.0.3",
"guzzlehttp/psr7": "^2.4",
+ "laravel/pint": "^1.18",
"league/flysystem-aws-s3-v3": "^3.25.1",
"league/flysystem-ftp": "^3.25.1",
"league/flysystem-path-prefixing": "^3.25.1",
@@ -1712,20 +1712,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2024-12-17T22:32:08+00:00"
+ "time": "2025-01-24T16:17:42+00:00"
},
{
"name": "laravel/prompts",
- "version": "v0.3.2",
+ "version": "v0.3.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/prompts.git",
- "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f"
+ "reference": "749395fcd5f8f7530fe1f00dfa84eb22c83d94ea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f",
- "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f",
+ "url": "https://api.github.com/repos/laravel/prompts/zipball/749395fcd5f8f7530fe1f00dfa84eb22c83d94ea",
+ "reference": "749395fcd5f8f7530fe1f00dfa84eb22c83d94ea",
"shasum": ""
},
"require": {
@@ -1769,22 +1769,22 @@
"description": "Add beautiful and user-friendly forms to your command-line applications.",
"support": {
"issues": "https://github.com/laravel/prompts/issues",
- "source": "https://github.com/laravel/prompts/tree/v0.3.2"
+ "source": "https://github.com/laravel/prompts/tree/v0.3.3"
},
- "time": "2024-11-12T14:59:47+00:00"
+ "time": "2024-12-30T15:53:31+00:00"
},
{
"name": "laravel/pulse",
- "version": "v1.3.2",
+ "version": "v1.3.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/pulse.git",
- "reference": "f0bf3959faa89c05fa211632b6d2665131b017fc"
+ "reference": "d618c94a63ce097f88f96fe0bab1e598c3b6aee4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/pulse/zipball/f0bf3959faa89c05fa211632b6d2665131b017fc",
- "reference": "f0bf3959faa89c05fa211632b6d2665131b017fc",
+ "url": "https://api.github.com/repos/laravel/pulse/zipball/d618c94a63ce097f88f96fe0bab1e598c3b6aee4",
+ "reference": "d618c94a63ce097f88f96fe0bab1e598c3b6aee4",
"shasum": ""
},
"require": {
@@ -1858,20 +1858,20 @@
"issues": "https://github.com/laravel/pulse/issues",
"source": "https://github.com/laravel/pulse"
},
- "time": "2024-12-12T18:17:53+00:00"
+ "time": "2025-01-02T15:49:30+00:00"
},
{
"name": "laravel/reverb",
- "version": "v1.4.4",
+ "version": "v1.4.5",
"source": {
"type": "git",
"url": "https://github.com/laravel/reverb.git",
- "reference": "22eab51c56c9a06e26a892b57e9b9d392e4e1da0"
+ "reference": "a058259ec799d6e27ce6d9f6b793a1f5d19bcabe"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/reverb/zipball/22eab51c56c9a06e26a892b57e9b9d392e4e1da0",
- "reference": "22eab51c56c9a06e26a892b57e9b9d392e4e1da0",
+ "url": "https://api.github.com/repos/laravel/reverb/zipball/a058259ec799d6e27ce6d9f6b793a1f5d19bcabe",
+ "reference": "a058259ec799d6e27ce6d9f6b793a1f5d19bcabe",
"shasum": ""
},
"require": {
@@ -1938,9 +1938,9 @@
],
"support": {
"issues": "https://github.com/laravel/reverb/issues",
- "source": "https://github.com/laravel/reverb/tree/v1.4.4"
+ "source": "https://github.com/laravel/reverb/tree/v1.4.5"
},
- "time": "2024-12-06T18:56:46+00:00"
+ "time": "2024-12-27T21:05:09+00:00"
},
{
"name": "laravel/sanctum",
@@ -2928,12 +2928,12 @@
"version": "3.8.4",
"source": {
"type": "git",
- "url": "https://github.com/briannesbitt/Carbon.git",
+ "url": "https://github.com/CarbonPHP/carbon.git",
"reference": "129700ed449b1f02d70272d2ac802357c8c30c58"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/129700ed449b1f02d70272d2ac802357c8c30c58",
+ "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/129700ed449b1f02d70272d2ac802357c8c30c58",
"reference": "129700ed449b1f02d70272d2ac802357c8c30c58",
"shasum": ""
},
@@ -3324,16 +3324,16 @@
},
{
"name": "opcodesio/log-viewer",
- "version": "v3.12.0",
+ "version": "v3.14.0",
"source": {
"type": "git",
"url": "https://github.com/opcodesio/log-viewer.git",
- "reference": "e9e4c41084be78a07e69924e71f943f366fe31d9"
+ "reference": "876166da7af4864faca7100e63534116c1c295b9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opcodesio/log-viewer/zipball/e9e4c41084be78a07e69924e71f943f366fe31d9",
- "reference": "e9e4c41084be78a07e69924e71f943f366fe31d9",
+ "url": "https://api.github.com/repos/opcodesio/log-viewer/zipball/876166da7af4864faca7100e63534116c1c295b9",
+ "reference": "876166da7af4864faca7100e63534116c1c295b9",
"shasum": ""
},
"require": {
@@ -3396,7 +3396,7 @@
],
"support": {
"issues": "https://github.com/opcodesio/log-viewer/issues",
- "source": "https://github.com/opcodesio/log-viewer/tree/v3.12.0"
+ "source": "https://github.com/opcodesio/log-viewer/tree/v3.14.0"
},
"funding": [
{
@@ -3408,7 +3408,7 @@
"type": "github"
}
],
- "time": "2024-11-11T11:17:46+00:00"
+ "time": "2025-01-10T12:03:56+00:00"
},
{
"name": "opcodesio/mail-parser",
@@ -4253,16 +4253,16 @@
},
{
"name": "pusher/pusher-php-server",
- "version": "7.2.6",
+ "version": "7.2.7",
"source": {
"type": "git",
"url": "https://github.com/pusher/pusher-http-php.git",
- "reference": "d89e9997191d18fb0fe03a956fa3ccfe0af524ea"
+ "reference": "148b0b5100d000ed57195acdf548a2b1b38ee3f7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/pusher/pusher-http-php/zipball/d89e9997191d18fb0fe03a956fa3ccfe0af524ea",
- "reference": "d89e9997191d18fb0fe03a956fa3ccfe0af524ea",
+ "url": "https://api.github.com/repos/pusher/pusher-http-php/zipball/148b0b5100d000ed57195acdf548a2b1b38ee3f7",
+ "reference": "148b0b5100d000ed57195acdf548a2b1b38ee3f7",
"shasum": ""
},
"require": {
@@ -4308,9 +4308,9 @@
],
"support": {
"issues": "https://github.com/pusher/pusher-http-php/issues",
- "source": "https://github.com/pusher/pusher-http-php/tree/7.2.6"
+ "source": "https://github.com/pusher/pusher-http-php/tree/7.2.7"
},
- "time": "2024-10-18T12:04:31+00:00"
+ "time": "2025-01-06T10:56:20+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -5176,16 +5176,16 @@
},
{
"name": "spatie/laravel-package-tools",
- "version": "1.18.0",
+ "version": "1.18.3",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-package-tools.git",
- "reference": "8332205b90d17164913244f4a8e13ab7e6761d29"
+ "reference": "ba67eee37d86ed775dab7dad58a7cbaf9a6cfe78"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/8332205b90d17164913244f4a8e13ab7e6761d29",
- "reference": "8332205b90d17164913244f4a8e13ab7e6761d29",
+ "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/ba67eee37d86ed775dab7dad58a7cbaf9a6cfe78",
+ "reference": "ba67eee37d86ed775dab7dad58a7cbaf9a6cfe78",
"shasum": ""
},
"require": {
@@ -5224,7 +5224,7 @@
],
"support": {
"issues": "https://github.com/spatie/laravel-package-tools/issues",
- "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.0"
+ "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.3"
},
"funding": [
{
@@ -5232,7 +5232,7 @@
"type": "github"
}
],
- "time": "2024-12-30T13:13:39+00:00"
+ "time": "2025-01-22T08:51:18+00:00"
},
{
"name": "symfony/clock",
@@ -8023,16 +8023,16 @@
},
{
"name": "filp/whoops",
- "version": "2.16.0",
+ "version": "2.17.0",
"source": {
"type": "git",
"url": "https://github.com/filp/whoops.git",
- "reference": "befcdc0e5dce67252aa6322d82424be928214fa2"
+ "reference": "075bc0c26631110584175de6523ab3f1652eb28e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2",
- "reference": "befcdc0e5dce67252aa6322d82424be928214fa2",
+ "url": "https://api.github.com/repos/filp/whoops/zipball/075bc0c26631110584175de6523ab3f1652eb28e",
+ "reference": "075bc0c26631110584175de6523ab3f1652eb28e",
"shasum": ""
},
"require": {
@@ -8082,7 +8082,7 @@
],
"support": {
"issues": "https://github.com/filp/whoops/issues",
- "source": "https://github.com/filp/whoops/tree/2.16.0"
+ "source": "https://github.com/filp/whoops/tree/2.17.0"
},
"funding": [
{
@@ -8090,7 +8090,7 @@
"type": "github"
}
],
- "time": "2024-09-25T12:00:00+00:00"
+ "time": "2025-01-25T12:00:00+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -8223,16 +8223,16 @@
},
{
"name": "laravel/pint",
- "version": "v1.19.0",
+ "version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/pint.git",
- "reference": "8169513746e1bac70c85d6ea1524d9225d4886f0"
+ "reference": "53072e8ea22213a7ed168a8a15b96fbb8b82d44b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/pint/zipball/8169513746e1bac70c85d6ea1524d9225d4886f0",
- "reference": "8169513746e1bac70c85d6ea1524d9225d4886f0",
+ "url": "https://api.github.com/repos/laravel/pint/zipball/53072e8ea22213a7ed168a8a15b96fbb8b82d44b",
+ "reference": "53072e8ea22213a7ed168a8a15b96fbb8b82d44b",
"shasum": ""
},
"require": {
@@ -8285,20 +8285,20 @@
"issues": "https://github.com/laravel/pint/issues",
"source": "https://github.com/laravel/pint"
},
- "time": "2024-12-30T16:20:10+00:00"
+ "time": "2025-01-14T16:20:53+00:00"
},
{
"name": "laravel/sail",
- "version": "v1.39.1",
+ "version": "v1.40.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/sail.git",
- "reference": "1a3c7291bc88de983b66688919a4d298d68ddec7"
+ "reference": "237e70656d8eface4839de51d101284bd5d0cf71"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/sail/zipball/1a3c7291bc88de983b66688919a4d298d68ddec7",
- "reference": "1a3c7291bc88de983b66688919a4d298d68ddec7",
+ "url": "https://api.github.com/repos/laravel/sail/zipball/237e70656d8eface4839de51d101284bd5d0cf71",
+ "reference": "237e70656d8eface4839de51d101284bd5d0cf71",
"shasum": ""
},
"require": {
@@ -8348,7 +8348,7 @@
"issues": "https://github.com/laravel/sail/issues",
"source": "https://github.com/laravel/sail"
},
- "time": "2024-11-27T15:42:28+00:00"
+ "time": "2025-01-13T16:57:11+00:00"
},
{
"name": "maximebf/debugbar",
@@ -8503,37 +8503,37 @@
},
{
"name": "nunomaduro/collision",
- "version": "v8.5.0",
+ "version": "v8.6.1",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
- "reference": "f5c101b929c958e849a633283adff296ed5f38f5"
+ "reference": "86f003c132143d5a2ab214e19933946409e0cae7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f5c101b929c958e849a633283adff296ed5f38f5",
- "reference": "f5c101b929c958e849a633283adff296ed5f38f5",
+ "url": "https://api.github.com/repos/nunomaduro/collision/zipball/86f003c132143d5a2ab214e19933946409e0cae7",
+ "reference": "86f003c132143d5a2ab214e19933946409e0cae7",
"shasum": ""
},
"require": {
"filp/whoops": "^2.16.0",
- "nunomaduro/termwind": "^2.1.0",
+ "nunomaduro/termwind": "^2.3.0",
"php": "^8.2.0",
- "symfony/console": "^7.1.5"
+ "symfony/console": "^7.2.1"
},
"conflict": {
- "laravel/framework": "<11.0.0 || >=12.0.0",
- "phpunit/phpunit": "<10.5.1 || >=12.0.0"
+ "laravel/framework": "<11.39.1 || >=13.0.0",
+ "phpunit/phpunit": "<11.5.3 || >=12.0.0"
},
"require-dev": {
- "larastan/larastan": "^2.9.8",
- "laravel/framework": "^11.28.0",
- "laravel/pint": "^1.18.1",
- "laravel/sail": "^1.36.0",
- "laravel/sanctum": "^4.0.3",
+ "larastan/larastan": "^2.9.12",
+ "laravel/framework": "^11.39.1",
+ "laravel/pint": "^1.20.0",
+ "laravel/sail": "^1.40.0",
+ "laravel/sanctum": "^4.0.7",
"laravel/tinker": "^2.10.0",
- "orchestra/testbench-core": "^9.5.3",
- "pestphp/pest": "^2.36.0 || ^3.4.0",
+ "orchestra/testbench-core": "^9.9.2",
+ "pestphp/pest": "^3.7.3",
"sebastian/environment": "^6.1.0 || ^7.2.0"
},
"type": "library",
@@ -8571,6 +8571,7 @@
"cli",
"command-line",
"console",
+ "dev",
"error",
"handling",
"laravel",
@@ -8596,7 +8597,7 @@
"type": "patreon"
}
],
- "time": "2024-10-15T16:06:32+00:00"
+ "time": "2025-01-23T13:41:43+00:00"
},
{
"name": "phar-io/manifest",
@@ -9041,16 +9042,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "11.5.2",
+ "version": "11.5.3",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "153d0531b9f7e883c5053160cad6dd5ac28140b3"
+ "reference": "30e319e578a7b5da3543073e30002bf82042f701"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/153d0531b9f7e883c5053160cad6dd5ac28140b3",
- "reference": "153d0531b9f7e883c5053160cad6dd5ac28140b3",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/30e319e578a7b5da3543073e30002bf82042f701",
+ "reference": "30e319e578a7b5da3543073e30002bf82042f701",
"shasum": ""
},
"require": {
@@ -9071,7 +9072,7 @@
"phpunit/php-timer": "^7.0.1",
"sebastian/cli-parser": "^3.0.2",
"sebastian/code-unit": "^3.0.2",
- "sebastian/comparator": "^6.2.1",
+ "sebastian/comparator": "^6.3.0",
"sebastian/diff": "^6.0.2",
"sebastian/environment": "^7.2.0",
"sebastian/exporter": "^6.3.0",
@@ -9122,7 +9123,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.2"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.3"
},
"funding": [
{
@@ -9138,7 +9139,7 @@
"type": "tidelift"
}
],
- "time": "2024-12-21T05:51:08+00:00"
+ "time": "2025-01-13T09:36:00+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -9312,16 +9313,16 @@
},
{
"name": "sebastian/comparator",
- "version": "6.2.1",
+ "version": "6.3.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "43d129d6a0f81c78bee378b46688293eb7ea3739"
+ "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/43d129d6a0f81c78bee378b46688293eb7ea3739",
- "reference": "43d129d6a0f81c78bee378b46688293eb7ea3739",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/d4e47a769525c4dd38cea90e5dcd435ddbbc7115",
+ "reference": "d4e47a769525c4dd38cea90e5dcd435ddbbc7115",
"shasum": ""
},
"require": {
@@ -9334,6 +9335,9 @@
"require-dev": {
"phpunit/phpunit": "^11.4"
},
+ "suggest": {
+ "ext-bcmath": "For comparing BcMath\\Number objects"
+ },
"type": "library",
"extra": {
"branch-alias": {
@@ -9377,7 +9381,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/comparator/issues",
"security": "https://github.com/sebastianbergmann/comparator/security/policy",
- "source": "https://github.com/sebastianbergmann/comparator/tree/6.2.1"
+ "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.0"
},
"funding": [
{
@@ -9385,7 +9389,7 @@
"type": "github"
}
],
- "time": "2024-10-31T05:30:08+00:00"
+ "time": "2025-01-06T10:28:19+00:00"
},
{
"name": "sebastian/complexity",
diff --git a/conf/nginx/nginx-site.conf b/conf/nginx/nginx-site.conf
new file mode 100644
index 00000000..89d070ce
--- /dev/null
+++ b/conf/nginx/nginx-site.conf
@@ -0,0 +1,20 @@
+server {
+ listen 80;
+ index index.php index.html;
+ root /var/www/html/public;
+
+ location / {
+ try_files $uri $uri/ /index.php?$query_string;
+ }
+
+ location ~ \.php$ {
+ fastcgi_pass app:9000;
+ fastcgi_index index.php;
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ include fastcgi_params;
+ }
+
+ location ~ /\.ht {
+ deny all;
+ }
+}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ef24567d..4b1cf948 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,61 +1,110 @@
services:
- app:
- build:
- context: .
- dockerfile: Dockerfile
- restart: unless-stopped
- networks:
- - docker-network
- ports:
- - 9000:9000
- depends_on:
- - db
-
- queue-worker:
- build:
- context: .
- dockerfile: Dockerfile
- restart: unless-stopped
- networks:
- - docker-network
- depends_on:
- - db
- command: php artisan queue:work
- # pulse-worker:
+ # app:
# build:
- # context: ./
+ # context: .
# dockerfile: Dockerfile
+ # container_name: MediaServer
+ # volumes:
+ # - ./data/media:/var/www/html/storage/public/media
+ # # - type: bind
+ # # source: ./media
+ # # target: /storage/public/media
# restart: unless-stopped
# networks:
# - docker-network
+ # ports:
+ # - 9000:9000
# depends_on:
# - db
- # command: php artisan pulse:check
- # reverb-worker:
- # build:
- # context: ./
- # dockerfile: Dockerfile
- # restart: unless-stopped
+ # environment:
+ # - DB_HOST=db
+ # - DB_PORT=5432
+ # - DB_DATABASE=mediaServer
+ # - DB_USERNAME=postgres
+ # - DB_PASSWORD=root
+ # # entrypoint: ['sh', '/usr/local/bin/entrypoint.sh']
+
+ # # queue-worker:
+ # # build:
+ # # context: .
+ # # dockerfile: Dockerfile
+ # # restart: unless-stopped
+ # # networks:
+ # # - docker-network
+ # # depends_on:
+ # # - db
+ # # - app
+ # # command: php artisan queue:work
+ # # pulse-worker:
+ # # build:
+ # # context: ./
+ # # dockerfile: Dockerfile
+ # # restart: unless-stopped
+ # # networks:
+ # # - docker-network
+ # # depends_on:
+ # # - db
+ # # command: php artisan pulse:check
+ # # reverb-worker:
+ # # build:
+ # # context: ./
+ # # dockerfile: Dockerfile
+ # # restart: unless-stopped
+ # # networks:
+ # # - docker-network
+ # # ports:
+ # # - 6001:6001
+ # # depends_on:
+ # # - db
+ # # command: php artisan reverb:start
+
+ # caddy:
+ # image: caddy:2.9.1-alpine
+ # ports:
+ # - 8080:8080
+ # # - 443:443
+ # # - 443:443/udp
+ # volumes:
+ # - .:/var/www/html
+ # - ./docker/caddy/Caddyfile:/etc/caddy/Caddyfile
# networks:
# - docker-network
- # ports:
- # - 6001:6001
# depends_on:
- # - db
- # command: php artisan reverb:start
+ # - app
+ # nginx:
+ # image: nginx:latest
+ # container_name: nginx
+ # volumes:
+ # - ./:/var/www/html
+ # - ./docker/nginx/app.conf:/etc/nginx/conf.d/default.conf
+ # ports:
+ # - "8000:80"
+ # depends_on:
+ # - app
+ # networks:
+ # - docker-network
- caddy:
- image: caddy:2.9.1-alpine
- ports:
- - 80:80
- - 443:443
+ app:
+ build:
+ context: .
+ dockerfile: Dockerfile
+ container_name: MediaServer
volumes:
- - .:/var/www/
- - ./Caddyfile:/etc/caddy/Caddyfile
+ - ./data/media:/var/www/html/storage/app/public/media
+ # restart: unless-stopped
networks:
- docker-network
+ ports:
+ - 8080:80
depends_on:
- - app
+ - db
+ environment:
+ - DB_HOST=db
+ - DB_PORT=5432
+ - DB_DATABASE=mediaServer
+ - DB_USERNAME=postgres
+ - DB_PASSWORD=root
+ # entrypoint: ['sh', '/var/www/html/docker/entrypoint.sh']
db:
image: bitnami/postgresql:17.2.0
platform: linux/amd64
diff --git a/docker/caddy/CaddyFile b/docker/caddy/CaddyFile
index 916bf412..aef25ae7 100644
--- a/docker/caddy/CaddyFile
+++ b/docker/caddy/CaddyFile
@@ -1,36 +1,33 @@
-:80 {
+http://app.test:8080 {
root * /var/www/html/public
encode gzip
- php_fastcgi app:9000
+ php_fastcgi app:9000 {
+ root /var/www/html/public
+ split .php
+ index index.php
+ try_files {path} {path}/ /index.php?{query}&{query}
+ }
- # Serve static files
file_server
- # Handle errors by rewriting to index.php for specific paths
- @notFound {
- path /{*,*.php}
+ handle_errors {
+ @404 {
+ method GET
+ not file
+ path not *
+ }
+ rewrite @404 /index.php
}
handle_errors {
rewrite * /index.php
}
- # Optional: Log requests for debugging
log {
output file /var/log/caddy.log
level debug
}
- @ws {
- header Connection *Upgrade*
- header Upgrade websocket
- }
-
- reverse_proxy @ws ws
- reverse_proxy app
-
- tls /var/lib/acme/app.test/cert.pem /var/lib/acme/app.test/key.pem {
- protocols tls1.3
- }
+ reverse_proxy /app
}
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
new file mode 100644
index 00000000..6ac01457
--- /dev/null
+++ b/docker/entrypoint.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# RUN npm i
+# npm run build-only
+# npm cache clean --force
+# rm -rf node_modules
+
+# "Installing Composer (PHP) dependencies"
+# composer install
+# "Setup environment variables"
+cp .env.example .env
+
+# "Setup Laravel app key"
+php artisan key:generate
+
+# "Setup Reverb app keys"
+php artisan reverb:generate
+
+# Link Storage
+php artisan storage:link
+
+# "Setup a database connection in the .env file and then run 'php artisan migrate'"
+# "Finally run 'npm run vite:php' to start the queue and websocket servers in addition to your web server (nginx)"
+php artisan migrate
diff --git a/docker/nginx/app.conf b/docker/nginx/app.conf
index 1135b111..7921b650 100644
--- a/docker/nginx/app.conf
+++ b/docker/nginx/app.conf
@@ -1,13 +1,13 @@
server {
listen 80;
- # server_name app.test;
+ server_name app.test;
add_header X-Frame-Options "SAMEORIGIN";
add_header X-Content-Type-Options "nosniff";
index index.php;
- root /var/www/mediaServer/public
+ root /var/www/html/public;
location /app {
proxy_http_version 1.1;
@@ -39,7 +39,7 @@ server {
fastcgi_index index.php;
- include fastcgi.conf;
+ # include fastcgi.conf;
include fastcgi_params;
diff --git a/docker/nginx/fastcgi.conf b/docker/nginx/fastcgi.conf
new file mode 100644
index 00000000..091738c6
--- /dev/null
+++ b/docker/nginx/fastcgi.conf
@@ -0,0 +1,26 @@
+
+fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+fastcgi_param QUERY_STRING $query_string;
+fastcgi_param REQUEST_METHOD $request_method;
+fastcgi_param CONTENT_TYPE $content_type;
+fastcgi_param CONTENT_LENGTH $content_length;
+
+fastcgi_param SCRIPT_NAME $fastcgi_script_name;
+fastcgi_param REQUEST_URI $request_uri;
+fastcgi_param DOCUMENT_URI $document_uri;
+fastcgi_param DOCUMENT_ROOT $document_root;
+fastcgi_param SERVER_PROTOCOL $server_protocol;
+fastcgi_param REQUEST_SCHEME $scheme;
+fastcgi_param HTTPS $https if_not_empty;
+
+fastcgi_param GATEWAY_INTERFACE CGI/1.1;
+fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
+
+fastcgi_param REMOTE_ADDR $remote_addr;
+fastcgi_param REMOTE_PORT $remote_port;
+fastcgi_param SERVER_ADDR $server_addr;
+fastcgi_param SERVER_PORT $server_port;
+fastcgi_param SERVER_NAME $server_name;
+
+# PHP only, required if PHP was built with --enable-force-cgi-redirect
+fastcgi_param REDIRECT_STATUS 200;