Rename dockerfile targets

Author: febus982

.github/workflows/ci-pipeline.yml

@@ -61,9 +61,9 @@ jobs:
     strategy:
       matrix:
         docker_target:
-          - http_app
-          - socketio_app
-          - dramatiq_app
+          - http
+          - socketio
+          - dramatiq
     steps:
       # GitHub gives only repository complete in <owner>/<repo> format.
       # Need some manual sheanigans

.gitlab_ci/build.yml

@@ -17,7 +17,7 @@ build-http-app-amd64:
   variables:
     DOCKER_IMAGE_NAME: $CI_PROJECT_NAME-http
     DOCKER_PLATFORM: "linux/amd64"
-    DOCKER_TARGET: http_app
+    DOCKER_TARGET: http
   tags:
     - saas-linux-small-amd64
   rules:
@@ -32,7 +32,7 @@ build-http-app-arm64:
   variables:
     DOCKER_IMAGE_NAME: $CI_PROJECT_NAME-http
     DOCKER_PLATFORM: "linux/arm64"
-    DOCKER_TARGET: http_app
+    DOCKER_TARGET: http
   tags:
     - saas-linux-small-arm64
   rules:

Dockerfile

@@ -76,21 +76,21 @@ COPY --chown=nonroot:nonroot src/common ./common
 COPY --chown=nonroot:nonroot src/alembic.ini .
 
 # Copy the http python package and requirements from relevant builder
-FROM base_app AS http_app
+FROM base_app AS http
 COPY --from=http_builder /venv /venv
 COPY --chown=nonroot:nonroot src/http_app ./http_app
 # Run CMD using array syntax, so it uses `exec` and runs as PID1
 CMD ["opentelemetry-instrument", "python", "-m", "http_app"]
 
 # Copy the socketio python package and requirements from relevant builder
-FROM base_app AS socketio_app
+FROM base_app AS socketio
 COPY --from=socketio_builder /venv /venv
 COPY --chown=nonroot:nonroot src/socketio_app ./socketio_app
 # Run CMD using array syntax, so it uses `exec` and runs as PID1
 CMD ["opentelemetry-instrument", "python", "-m", "socketio_app"]
 
 # Copy the dramatiq python package and requirements from relevant builder
-FROM base_app AS dramatiq_app
+FROM base_app AS dramatiq
 COPY --from=dramatiq_builder /venv /venv
 COPY --chown=nonroot:nonroot src/dramatiq_worker ./dramatiq_worker
 # Run CMD using array syntax, so it uses `exec` and runs as PID1