less files in docker image

Ziul · Ziul · commit afdaa4050074 · 2025-05-21T15:12:29.000-03:00
Signed-off-by: Luiz Oliveira &lt;ziuloliveira@gmail.com&gt;
diff --git a/.dockerignore b/.dockerignore
@@ -257,4 +257,8 @@ charts/
 *.tgz
 tests/
 *.ini
-Dockerfile
+Dockerfile
+.dockerignore
+.gitignore
+.pre-commit-config.yaml
+*.md
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -56,6 +56,8 @@ jobs:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
+          build-args: |
+            APP_VERSION=${{ needs.versioning.outputs.FullSemVer }}
           tags: |
             ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:${{ needs.versioning.outputs.MajorMinorPatch }}
             ${{ secrets.DOCKER_REGISTRY }}/${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}:latest
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,8 @@
 FROM python:3.13-slim
 
 # Install Poetry
-RUN pip install poetry>=1.8.3
+RUN pip install --no-cache-dir "poetry>=1.8.3"
+
 ENV POETRY_NO_INTERACTION=1 \
     POETRY_VIRTUALENVS_IN_PROJECT=1 \
     POETRY_VIRTUALENVS_CREATE=1 \
@@ -11,11 +12,21 @@ WORKDIR /app
 
 COPY pyproject.toml poetry.lock* README.md ./
 RUN poetry config virtualenvs.create false \
-    && poetry install --no-interaction --no-ansi --no-root \
+    && poetry install --no-interaction --no-ansi --no-root --only main \
     && rm -rf $POETRY_CACHE_DIR
+
 COPY . .
+
 RUN mkdir -p static/openapi
+
+# create non-root user
+RUN useradd -m appuser
+USER appuser
+
+# Build-time variable for app version
+ARG APP_VERSION=dev
+ENV APP_VERSION=${APP_VERSION}
+
 EXPOSE 8000
 
-CMD ["poetry", "run", "fastapi", "run", "server.py"]
-# CMD ["poetry", "run", "kopf", "run", "controller.py"]
+CMD ["poetry", "run", "fastapi", "run", "server.py"]
diff --git a/server.py b/server.py
@@ -197,6 +197,7 @@ async def config(request: Request):
             "urls": swaggers,
             "title": os.environ.get("TITLE", "Swagger Operator"),
             "version": os.environ.get("SWAGGER_OPERATOR_VERSION", ""),
+            "compiling_version": os.environ.get("APP_VERSION", ""),
             "session": request.session,
             "settings": {
                 "enable_oidc": ENABLE_OIDC,
diff --git a/templates/config.html b/templates/config.html
@@ -5,7 +5,7 @@
 </head>
 <body>
     <h1>
-        {{ title }}{% if version %} - v{{ version }}{% endif %}
+        {{ title }}{% if version %} - v{{ version }}{% endif %} {% if compiling_version %} ({{ compiling_version }}){% endif %}
     </h1>
 
 
