fix: update docker and package build (#26)

Author: DrackThor

.github/workflows/docker-build.yml

@@ -34,6 +34,8 @@ jobs:
         run: |
           docker build \
             -f docker/Dockerfile \
+            --build-arg APP_VERSION=${GITHUB_REF_NAME} \
+            --build-arg APP_COMMIT_SHA=${GITHUB_SHA} \
             -t ghcr.io/${{ steps.repo.outputs.repo }}:${GITHUB_REF_NAME} \
             -t ghcr.io/${{ steps.repo.outputs.repo }}:latest \
             .
@@ -43,12 +45,16 @@ jobs:
       - name: Build & Push Scanner specific Docker image
         run: |
           docker build \
+            --build-arg APP_VERSION=${GITHUB_REF_NAME} \
+            --build-arg APP_COMMIT_SHA=${GITHUB_SHA} \
             -f docker/cnspec.Dockerfile \
             -t ghcr.io/${{ steps.repo.outputs.repo }}:${GITHUB_REF_NAME}-cnspec \
             -t ghcr.io/${{ steps.repo.outputs.repo }}:latest-cnspec \
             .
 
           docker build \
+            --build-arg APP_VERSION=${GITHUB_REF_NAME} \
+            --build-arg APP_COMMIT_SHA=${GITHUB_SHA} \
             -f docker/snyk.Dockerfile \
             -t ghcr.io/${{ steps.repo.outputs.repo }}:${GITHUB_REF_NAME}-snyk \
             -t ghcr.io/${{ steps.repo.outputs.repo }}:latest-snyk \

docker/Dockerfile

@@ -3,10 +3,11 @@ ARG BASE_IMAGE_REPOSITORY="python"
 ARG BASE_IMAGE_TAG="3.12-alpine3.22"
 FROM ${BASE_IMAGE_REGISTRY}/${BASE_IMAGE_REPOSITORY}:${BASE_IMAGE_TAG}
 
-ARG APP_COMMIT_SHA=""
-ARG APP_VERSION=""
+ARG APP_COMMIT_SHA="changeme"
+ARG APP_VERSION="v0.0.1"
 ENV APP_COMMIT_SHA=$APP_COMMIT_SHA
 ENV APP_VERSION=$APP_VERSION
+ENV SETUPTOOLS_SCM_PRETEND_VERSION=$APP_VERSION
 
 # install uv
 COPY --from=docker.io/astral/uv@sha256:e4644cb5bd56fdc2c5ea3ee0525d9d21eed1603bccd6a21f887a938be7e85be1 /uv /uvx /bin/
@@ -25,13 +26,13 @@ USER airgapper
 WORKDIR /home/airgapper
 
 # Copy requirements first to leverage Docker cache
-COPY pyproject.toml uv.lock ./
-
-# Install dependencies
-RUN uv sync --frozen # --no-dev
+COPY pyproject.toml uv.lock LICENSE README.md ./
 
 # Copy all local packages and files
-COPY src/ .
+COPY src/ src/
+
+# Install dependencies
+RUN uv venv && uv sync --frozen
 
 # Specify the command to run the app
-ENTRYPOINT ["uv", "run", "python", "main.py"]
+ENTRYPOINT ["uv", "run", "cnairgapper"]

pyproject.toml

@@ -44,8 +44,8 @@ build-backend = "hatchling.build"
 [tool.hatch.version]
 source = "vcs"
 
-[tool.hatch.build.hooks.vcs]
-version-file = "src/cnairgapper/_version.py"
+# [tool.hatch.build.hooks.vcs]
+# version-file = "src/cnairgapper/_version.py"
 
 [tool.hatch.build.targets.sdist]
 include = ["src", "README.md", "LICENSE", "pyproject.toml"]

src/cnairgapper/cli/parser.py

@@ -1,4 +1,6 @@
 import argparse
+from importlib.metadata import PackageNotFoundError
+from importlib.metadata import version as pkg_version
 
 import configargparse
 
@@ -31,10 +33,24 @@ def create_parser():
         "--config-folder", help="Path to a folder containing YAML sync config files"
     )
 
+    parser.add_argument(
+        "--version",
+        action="version",
+        version=_get_version(),
+    )
+
     parser.add_argument("--debug", action="store_true", default=False, help="Enable debug logging")
     return parser
 
 
+def _get_version() -> str:
+    try:
+        # must match [project].name in pyproject.toml
+        return pkg_version("cnairgapper")
+    except PackageNotFoundError:
+        return "0.0.0-dev"
+
+
 def validate_arguments(args: argparse.Namespace, parser: argparse.ArgumentParser) -> bool:
     """Validates the provided command-line arguments to ensure exactly one option is specified
     between mutually exclusive pairs (--credentials-file, --credentials-folder) and