Skip to content

A self-hosted media server and file management system

fix: change versioning, return to 8086 default docker port and incorperate manifest

aminnausinf01ec2ef2f3b
diff --git a/.github/workflows/ci-docker-release.yml b/.github/workflows/ci-docker-release.yml
index 5ce8dd29..ca6f517e 100644
--- a/.github/workflows/ci-docker-release.yml
+++ b/.github/workflows/ci-docker-release.yml
@@ -171,7 +171,7 @@ jobs:
run: |
VERSION_FILE="VERSION"
if [ ! -f "$VERSION_FILE" ]; then
- echo "0.1.0" > "$VERSION_FILE"
+ echo "0.1.0" > "$VERSION_FILE"
fi
- name: Set Release Tag and Prerelease Status
@@ -181,6 +181,9 @@ jobs:
CURRENT_VERSION=$(cat $VERSION_FILE)
IFS='.' read -r MAJOR MINOR PATCH <<< "$CURRENT_VERSION"
+ BUILD_COUNT=$(git rev-list --count HEAD)
+ SHORT_SHA=$(git rev-parse --short HEAD)
+
PRERELEASE=false
DOCKER_TAG=""
TAG=""
@@ -188,7 +191,7 @@ jobs:
if [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
PATCH=$((PATCH + 1))
NEW_VERSION="$MAJOR.$MINOR.$PATCH"
- TAG="${NEW_VERSION}b"
+ TAG="${NEW_VERSION}-beta.${BUILD_COUNT}"
DOCKER_TAG="beta"
PRERELEASE=true
elif [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
diff --git a/app/Support/AppManifest.php b/app/Support/AppManifest.php
index 26153766..4ec06ab4 100644
--- a/app/Support/AppManifest.php
+++ b/app/Support/AppManifest.php
@@ -2,6 +2,7 @@
namespace App\Support;
+use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\File;
class AppManifest {
@@ -9,6 +10,8 @@ class AppManifest {
$path = storage_path('app/manifest.json');
if (! File::exists($path)) {
+ Artisan::call('app:manifest');
+
return ['version' => 'unknown', 'commit' => null];
}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 0c874ce9..14ba7d14 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -23,9 +23,9 @@ services:
- ./logs/nginx:/var/log/nginx
- shared-env:/var/www/html/shared
ports:
- - '8080:8080'
+ - '${APP_PORT:-8080}:8080'
expose:
- - '8080'
+ - '${APP_PORT:-8080}'
environment:
- SHARED_UID=9999
- SHARED_GID=9999
@@ -68,6 +68,7 @@ services:
test: ['CMD', 'healthcheck-queue']
start_period: 10s
networks:
+ mediaServer-db:
default:
aliases: []
event-queue:
@@ -86,6 +87,7 @@ services:
healthcheck:
test: ['CMD', 'healthcheck-queue']
networks:
+ mediaServer-db:
default:
aliases: []
scheduler:
@@ -104,6 +106,7 @@ services:
healthcheck:
test: ['CMD', 'healthcheck-schedule']
networks:
+ mediaServer-db:
default:
aliases: []
ws:
diff --git a/docker/.env.docker b/docker/.env.docker
index 22354b64..3d3b8256 100644
--- a/docker/.env.docker
+++ b/docker/.env.docker
@@ -2,8 +2,8 @@
APP_SCHEME=http # App Protocol -> http OR https -> Should not change
-APP_HOST=app.test # App URL -> Website will be available on https://app.test if you use caddy and http://app.test:8080 otherwise
-APP_PORT=8080 # App Port -> Website will be available on https://app.test if you use caddy and http://app.test:8080 otherwise
+APP_HOST=app.test # App URL -> Website will be available on https://app.test if you use caddy and http://app.test:8086 otherwise
+APP_PORT=8086 # App Port -> Website will be available on https://app.test if you use caddy and http://app.test:8086 otherwise
REVERB_PORT=443 # Websocket Port -> Set to 6001 if you have websocket connection issues
REVERB_SCHEME=https # Websocket Protocol -> http OR https -> Set to HTTPS if you have a valid SSL Certificate for your URL
diff --git a/docker/entrypoint.d/1-keys.sh b/docker/entrypoint.d/1-keys.sh
index 5fe73ddf..61033817 100644
--- a/docker/entrypoint.d/1-keys.sh
+++ b/docker/entrypoint.d/1-keys.sh
@@ -52,6 +52,8 @@ else
echo "Updated Laravel .env with reverb keys."
fi
+php artisan app:manifest
+
# else
# php artisan reverb:generate
diff --git a/storage/app/.gitignore b/storage/app/.gitignore
index 8b936095..1cab59cd 100755
--- a/storage/app/.gitignore
+++ b/storage/app/.gitignore
@@ -2,3 +2,4 @@
!public/
!.gitignore
chrome
+manifest.json
diff --git a/storage/app/manifest.json b/storage/app/manifest.json
deleted file mode 100644
index 45f3ea2e..00000000
--- a/storage/app/manifest.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "version": "beta-088f1c9",
- "commit": "fb38230d",
- "php_version": "8.3.10",
- "laravel_version": "11.44.1",
- "os": "Windows NT build 19045 (Windows 10)",
- "cpu_arch": "AMD64",
- "cpu_cores": "20\n"
-}
\ No newline at end of file