updated build pipeline

Author: kamikaze

.github/workflows/python-publish.yml renamed to .github/workflows/python-publish.yaml

@@ -6,7 +6,7 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Upload Python Package
+name: Build and push release
 
 on:
   release:
@@ -16,8 +16,8 @@ permissions:
   contents: read
 
 jobs:
-  deploy:
-
+  pypi-build-and-push:
+    name: Build and push wheel package
     runs-on: ubuntu-latest
 
     steps:
@@ -37,3 +37,27 @@ jobs:
       with:
         user: __token__
         password: ${{ secrets.PYPI_API_TOKEN }}
+
+  docker-build-and-push:
+    name: Build and push Docker images
+    needs: pypi-build-and-push
+    uses: ./.github/workflows/reusable-docker-build.yaml
+
+    permissions:
+      contents: read
+      packages: write
+      pull-requests: write
+
+    secrets:
+      dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
+      dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    with:
+      dockerhub-enable: true
+      ghcr-enable: true
+      platforms: linux/amd64,linux/arm64
+      file: Dockerfile.release
+
+      image-names: |
+        kamikazer/${{ github.event.repository.name }}
+        ghcr.io/${{ github.repository }}

Dockerfile

@@ -1,41 +1,41 @@
 FROM python:3.11-slim as build-image
 
-WORKDIR /usr/local/app
-
-RUN apt-get update && apt-get upgrade -y
+RUN apt-get update
 RUN apt-get install -y curl ca-certificates gnupg
-RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+RUN curl -fSsL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql.gpg > /dev/null
+RUN apt-get update
 
 RUN apt-get install -y gcc g++ make postgresql-server-dev-all libpq-dev libffi-dev git cargo
 
 COPY ./ /tmp/build
-COPY src/dataset_image_annotator/db/migrations ./migrations/
-COPY src/dataset_image_annotator/db/alembic.ini ./alembic.ini
 
 RUN  (cd /tmp/build \
      && python3 -m venv venv-dev \
      && . venv-dev/bin/activate \
      && python3 -m pip install -U -r requirements_dev.txt \
      && python3 setup.py bdist_wheel)
 
+WORKDIR /usr/local/app
+
+COPY src/dataset_image_annotator/db/migrations ./migrations/
+COPY src/dataset_image_annotator/db/alembic.ini ./alembic.ini
 
-RUN  export APP_HOME=/usr/local/app \
-     && (cd $APP_HOME \
-         && python3 -m venv venv \
-         && . venv/bin/activate \
-         && python3 -m pip install -U pip \
-         && python3 -m pip install -U setuptools \
-         && python3 -m pip install -U wheel \
-         && python3 -m pip install -U dataset_image_annotator[web] --find-links=/tmp/build/dist)
+RUN  (python3 -m venv venv \
+      && . venv/bin/activate \
+      && python3 -m pip install -U pip \
+      && python3 -m pip install -U setuptools \
+      && python3 -m pip install -U wheel \
+      && python3 -m pip install -U uvloop \
+      && python3 -m pip install -U /tmp/build/dist/*.whl)
 
 
 FROM python:3.11-slim
 
 ENV  PYTHONPATH=/usr/local/app
 
+COPY --from=build-image /usr/share/keyrings/ /usr/share/keyrings/
 RUN  mkdir -p /usr/local/app \
      && apt-get update \
-     && apt-get -y upgrade \
      && apt-get install -y libpq-dev
 
 WORKDIR /usr/local/app

Dockerfile.release

@@ -0,0 +1,48 @@
+FROM python:3.11-slim as build-image
+
+WORKDIR /usr/local/app
+COPY src/dataset_image_annotator/db/migrations ./migrations/
+COPY src/dataset_image_annotator/db/alembic.ini ./alembic.ini
+
+RUN apt-get update
+RUN apt-get install -y curl ca-certificates gnupg
+RUN curl -fSsL https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /usr/share/keyrings/postgresql.gpg > /dev/null
+RUN apt-get update
+
+RUN apt-get install -y gcc g++ make postgresql-server-dev-all libpq-dev libffi-dev git cargo
+
+RUN  export APP_HOME=/usr/local/app \
+     && (cd $APP_HOME \
+         && python3 -m venv venv \
+         && . venv/bin/activate \
+         && python3 -m pip install -U pip \
+         && python3 -m pip install -U setuptools \
+         && python3 -m pip install -U wheel \
+         && python3 -m pip install -U uvloop \
+         && python3 -m pip install -U dataset_image_annotator[web])
+
+
+FROM python:3.11-slim
+
+ENV  PYTHONPATH=/usr/local/app
+
+COPY --from=build-image /usr/share/keyrings/ /usr/share/keyrings/
+RUN  mkdir -p /usr/local/app \
+     && apt-get update \
+     && apt-get install -y libpq-dev
+
+WORKDIR /usr/local/app
+
+COPY --from=build-image /usr/local/app/ ./
+
+RUN  groupadd -r appgroup \
+     && useradd -r -G appgroup -d /home/appuser appuser \
+     && install -d -o appuser -g appgroup /usr/local/app/logs
+
+USER  appuser
+
+EXPOSE 8080
+
+
+CMD ["/usr/local/app/venv/bin/python3", "-m", "uvicorn", "dataset_image_annotator.api.http:app", \
+     "--host", "0.0.0.0", "--port", "8080"]