Merge pull request #37 from cmathews393/beta

Merge in version outputting to better track issues

Author: cmathews393

.github/workflows/docker-image.yml

@@ -31,4 +31,5 @@ jobs:
           push: true
           tags: |
             0xchloe/spotiplex:${{ github.ref_name == 'main' && 'latest' || github.ref_name }}
-
+          build-args: |
+            COMMIT_SHA=${{ github.sha }}

Dockerfile

@@ -6,13 +6,19 @@ ENV POETRY_VERSION=1.7.1
 ENV PYTHONUNBUFFERED=1
 ENV CRON_SCHEDULE=@daily
 ENV DOCKER=True
+
+# Accept commit SHA as a build argument
+ARG COMMIT_SHA
+ENV COMMIT_SHA=${COMMIT_SHA}
+
 # Install Poetry
 RUN pip install "poetry==$POETRY_VERSION"
 
 # Copy the application source code
 COPY ./spotiplex ${SRC_DIR}/spotiplex
 COPY pyproject.toml poetry.lock ${SRC_DIR}/
 COPY README.md ${SRC_DIR}/
+
 # Set the working directory
 WORKDIR ${SRC_DIR}
 
@@ -24,11 +30,11 @@ RUN poetry config virtualenvs.create false \
 RUN wget -O /usr/local/bin/supercronic https://github.com/aptible/supercronic/releases/download/v0.1.11/supercronic-linux-amd64 \
     && chmod +x /usr/local/bin/supercronic
 
-
 # Copy entrypoint script
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
 RUN chmod +x /usr/local/bin/entrypoint.sh
 
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
+# Log the commit SHA during the build
+RUN echo "Built from commit SHA: $COMMIT_SHA"
 
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "spotiplex"
-version = "0.1.0"
+version = "1.0.0"
 description = ""
 authors = ["0xChloe <[email protected]>"]
 license = "GPLv3"

spotiplex/config.py

@@ -13,6 +13,7 @@ class Config:
     """Generic Config class to pull environment vars."""
 
     if os.environ.get("DOCKER"):
+        SPOTIPLEX_VERSION = os.environ.get("COMMIT_SHA")
         SPOTIFY_API_KEY = os.environ.get("SPOTIFY_API_KEY")
         SPOTIFY_API_ID = os.environ.get("SPOTIFY_API_ID")
 

spotiplex/main.py

@@ -7,6 +7,7 @@
 
 import spotiplex.modules.confighandler.main as config_handler
 import spotiplex.modules.spotiplex.main as sp_module
+from spotiplex.config import Config
 
 logger.trace("Initializing logger...")
 logger.remove()
@@ -20,6 +21,7 @@
 @app.command()
 def sync_lidarr_imports() -> None:
     """Syncs all playlists currently being pulled via Lidarr."""
+    logger.debug("We are running on commit: ", Config.SPOTIPLEX_VERSION)
     sp_instance = sp_module.Spotiplex(lidarr=True, playlist_id=None)
     sp_instance.run()
 
@@ -34,6 +36,7 @@ def generate_env() -> None:
 @app.command()
 def sync_manual_lists() -> None:
     """Syncs all playlists specified in config file."""
+    logger.debug("We are running on commit: ", Config.SPOTIPLEX_VERSION)
     sp_instance = sp_module.Spotiplex(lidarr=False, playlist_id=None)
     sp_instance.run()