fix: update Dockerfile and docker-compose.yml to change port from 8080 to 8000 (#240)

Author: csikb

Dockerfile

@@ -21,16 +21,16 @@ RUN --mount=type=cache,target=/root/.cache \
     --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
     uv sync --locked --no-dev --no-install-project
 
-COPY . /src
-WORKDIR /src
+COPY ./src /src
 
 # Install the application into the build environment.
 # We won't need the source code in the production image,
 # only the installed packages.
 RUN --mount=type=cache,target=/root/.cache \
+    --mount=type=bind,source=uv.lock,target=uv.lock \
+    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
     uv sync --locked --no-dev --no-editable
 
-
 FROM python AS app
 
 # Add the virtualenv to PATH
@@ -40,12 +40,12 @@ ENV PATH="/app/bin:${PATH}"
 RUN addgroup -S nonroot && adduser -S nonroot -G nonroot
 
 # Copy the pre-built /app virtualenv and change ownership to nonroot
-COPY --from=builder --chown=nonroot:nonroot /app /app
+COPY --from=builder --chown=nonroot:nonroot --chmod=500 /app /app
 
 USER nonroot:nonroot
 WORKDIR /app
 
 ENV SERVER_BASE_PATH="/home/nonroot/assets"
-CMD ["uvicorn", "bss_web_file_server.main:app", "--host", "0.0.0.0", "--port", "8080"]
+CMD ["fastapi", "run", "--entrypoint", "bss_web_file_server.main:app"]
 
-EXPOSE 8080
+EXPOSE 8000

docker-compose.yml

@@ -3,11 +3,11 @@ services:
     build:
       context: .
     ports:
-      - "8080"
+      - "8000"
     environment:
       SERVER_BASE_PATH: /home/nonroot/assets
     healthcheck:
-      test: python -c "import requests, sys; sys.exit(0 if 'UP' in requests.get('http://localhost:8080/health').text else 1)"
+      test: python -c "import requests, sys; sys.exit(0 if 'UP' in requests.get('http://localhost:8000/health').text else 1)"
       start_period: 2s
       interval: 10s
       timeout: 5s

scripts/convert-image.sh

@@ -1,5 +1,6 @@
-#!/usr/bin/env sh
-if [ "$#" -ne 2 ]; then
+#!/bin/bash
+
+if [[ "$#" -ne 2 ]]; then
     echo "1st argument: input image"
     echo "2nd argument: output folder"
     exit

scripts/convert-poster.sh

@@ -1,5 +1,6 @@
-#!/usr/bin/env sh
-if [ "$#" -ne 2 ]; then
+#!/bin/bash
+
+if [[ "$#" -ne 2 ]]; then
     echo "1st argument: input image"
     echo "2nd argument: output folder"
     exit

tests-int/test_health.py

@@ -14,15 +14,15 @@ def compose():
         compose_file_name="docker-compose.yml",
         build=True,
     )
-    compose.waiting_for({"app": LogMessageWaitStrategy("8080")})
+    compose.waiting_for({"app": LogMessageWaitStrategy("8000")})
     compose.start()
     yield compose
     compose.stop()
 
 
 def test_health(compose: DockerCompose):
     host = compose.get_service_host("app")
-    port = compose.get_service_port("app", 8080)
+    port = compose.get_service_port("app", 8000)
     assert "Application startup complete." in compose.get_logs("app")[0]
     response = requests.get(f"http://{host}:{port}/health")
     assert response.status_code == 200
@@ -31,7 +31,7 @@ def test_health(compose: DockerCompose):
 
 def test_ping(compose: DockerCompose):
     host = compose.get_service_host("app")
-    port = compose.get_service_port("app", 8080)
+    port = compose.get_service_port("app", 8000)
     response = requests.get(f"http://{host}:{port}/ping")
     assert response.status_code == 200
     assert response.text == "PONG"