Merge pull request #223 from Wizarrrr/v3-beta

V3 beta

.dockerignore

@@ -3,7 +3,6 @@ venv/
 .DS_Store
 .gitignore
 .git
-.github
 .idea
 .buildHelper.txt
 node_modules

.github/workflows/beta-ci.yml

@@ -22,9 +22,9 @@ jobs:
         uses: actions/checkout@v2
 
       # Get the Release Version from .github/latest
-      - name: Get the Release Version from .github/latest
+      - name: Get the Release Version from latest
         id: get_version
-        run: echo "::set-output name=version::$(cat .github/latest)"
+        run: echo "::set-output name=version::$(cat latest)"
 
       # Set up Docker Buildx
       - name: Set up Docker Buildx

.github/workflows/beta-release.yml

@@ -13,15 +13,15 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      # Get the previous package version from .github/latest
-      - name: Get previous package version from .github/latest
+      # Get the previous package version from latest
+      - name: Get previous package version from latest
         id: get_prev_version
-        run: echo "::set-output name=prev_version::$(cat .github/latest)"
+        run: echo "::set-output name=prev_version::$(cat latest)"
 
-      # Get the current package version from .github/latest
+      # Get the current package version from latest
       - name: Get current package version
         id: get_current_version
-        run: echo "::set-output name=current_version::$(cat .github/latest)"
+        run: echo "::set-output name=current_version::$(cat latest)"
 
       # Compare the previous and current versions
       - name: Compare versions

Dockerfile

@@ -1,6 +1,10 @@
 # Build Stage
 FROM --platform=$BUILDPLATFORM python:3.12.0-alpine
 
+# Copy over version
+WORKDIR /data
+COPY latest latest
+
 #######################
 # Backend Build Stage #
 #######################
@@ -48,13 +52,9 @@ RUN cp /usr/share/zoneinfo/UTC /etc/localtime \
 # Set environment variables
 ENV TZ=Etc/UTC
 
-# Get the version from package.json in the ./ directory
-COPY ./package.json ./version.json
-
 LABEL maintainer="Ashley Bailey <admin@ashleybailey.me>"
 LABEL description="Wizarr is an advanced user invitation and management system for Jellyfin, Plex, Emby etc."
 
-
 # Expose ports
 EXPOSE 5690
 WORKDIR /data/backend

backend/app/utils/software_lifecycle.py

@@ -23,9 +23,9 @@ def get_latest_beta_version():
         return None
 
 def get_current_version():
-    package = path.abspath(path.join(path.dirname(__file__), "../", "../", "../", "package.json"))
+    package = path.abspath(path.join(path.dirname(__file__), "../", "../", "../", "latest"))
     with open(package, "r", encoding="utf-8") as f:
-        return parse(load(f)["version"])
+        return parse(f.read())
 
 
 def is_beta():

latest

@@ -0,0 +1 @@
+3.4.1