Merge pull request #26 from JohanDevl/develop

Add version information to Docker images

Author: JohanDevl

.github/workflows/docker-publish.yml

@@ -42,6 +42,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer
@@ -51,6 +53,20 @@ jobs:
         with:
           cosign-release: "v2.2.4"
 
+      # Get version information for main branch
+      - name: Get version info
+        id: version
+        if: github.ref == 'refs/heads/main'
+        run: |
+          # Get latest version tag
+          LATEST_TAG=$(git tag -l "v*" | grep -v "-" | sort -V | tail -n 1)
+          if [ -z "$LATEST_TAG" ]; then
+            LATEST_TAG="v1.0.0"
+          fi
+          # Store the version without the 'v' prefix
+          VERSION=${LATEST_TAG#v}
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
       # Set up BuildKit Docker container builder to be able to build
       # multi-platform images and export cache
       # https://github.com/docker/setup-buildx-action
@@ -100,6 +116,8 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           outputs: type=docker,dest=/tmp/docker-image.tar
+          build-args: |
+            APP_VERSION=${{ steps.version.outputs.version || 'develop' }}
 
       # Export Docker image for release
       - name: Export Docker image

Dockerfile

@@ -1,5 +1,13 @@
 FROM alpine:3.18
 
+# Define build arguments for version
+ARG APP_VERSION=dev
+
+# Add version labels
+LABEL org.opencontainers.image.version=$APP_VERSION \
+      org.opencontainers.image.title="Export Trakt 4 Letterboxd" \
+      org.opencontainers.image.description="Tool for exporting Trakt.tv history to Letterboxd compatible format"
+
 # Install required packages
 RUN apk add --no-cache \
     bash \
@@ -32,7 +40,8 @@ ENV DOSLOG=/app/logs \
     BACKUP_DIR=/app/backup \
     CONFIG_DIR=/app/config \
     CRON_SCHEDULE="" \
-    EXPORT_OPTION="normal"
+    EXPORT_OPTION="normal" \
+    APP_VERSION=$APP_VERSION
 
 # Set volume for persistent data
 VOLUME ["/app/logs", "/app/copy", "/app/backup", "/app/config"]

docker-entrypoint.sh

@@ -16,6 +16,11 @@ log_message() {
     esac
 }
 
+# Show version information
+show_version() {
+    log_message "INFO" "Starting Export Trakt 4 Letterboxd container - Version: ${APP_VERSION:-unknown}"
+}
+
 # Debug function for file and directory information
 debug_file_info() {
     local path="$1"
@@ -61,6 +66,7 @@ debug_file_info() {
 
 # Initial system information
 log_message "INFO" "Starting Docker container for Export_Trakt_4_Letterboxd"
+show_version
 log_message "DEBUG" "Container environment:"
 log_message "DEBUG" "User: $(id)"
 log_message "DEBUG" "Working directory: $(pwd)"