publish tipg:uvicorn

Author: vincentsarago

.github/workflows/ci.yml

@@ -145,6 +145,12 @@ jobs:
     needs: [tests]
     if: github.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release'
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        image-version:
+        - 'uvicorn'
+        - 'gunicorn'
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -164,8 +170,17 @@ jobs:
 
       - name: Set tag version
         id: tag
-        # https://stackoverflow.com/questions/58177786/get-the-current-pushed-tag-in-github-actions
-        run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
+        run: |
+          echo "version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+
+      - name: Image name
+        id: image
+        run: |
+          if [ ${{ matrix.image-version }} = 'uvicorn' ]; then
+            echo "name=${{ github.repository }}:uvicorn-" >> $GITHUB_OUTPUT
+          else
+            echo "name=${{ github.repository }}:" >> $GITHUB_OUTPUT
+          fi
 
       # Push `latest` when commiting to main
       - name: Build and push
@@ -174,10 +189,10 @@ jobs:
         with:
           platforms: linux/amd64,linux/arm64
           context: .
-          file: dockerfiles/Dockerfile
+          file: dockerfiles/Dockerfile.${{ matrix.image-version }}
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:latest
+            ghcr.io/${{ steps.image.outputs.name }}latest
 
       # Push `{VERSION}` when pushing a new tag
       - name: Build and push
@@ -186,7 +201,7 @@ jobs:
         with:
           platforms: linux/amd64,linux/arm64
           context: .
-          file: dockerfiles/Dockerfile
+          file: dockerfiles/Dockerfile.${{ matrix.image-version }}
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:${{ steps.tag.outputs.tag }}
+            ghcr.io/${{ steps.image.outputs.name }}${{ steps.tag.outputs.tag }}

README.md

@@ -96,7 +96,7 @@ $ uvicorn tipg.main:app
 
 # or using Docker
 
-$ docker-compose up
+$ docker-compose up app
 ```
 
 <p align="center">

docker-compose.yml

@@ -4,7 +4,7 @@ services:
   app:
     build:
       context: .
-      dockerfile: dockerfiles/Dockerfile
+      dockerfile: dockerfiles/Dockerfile.gunicorn
     environment:
       - HOST=0.0.0.0
       - PORT=8081
@@ -24,6 +24,30 @@ services:
     volumes:
       - ./dockerfiles/scripts:/tmp/scripts
 
+  app-uvicorn:
+    build:
+      context: .
+      dockerfile: dockerfiles/Dockerfile.uvicorn
+    environment:
+      - HOST=0.0.0.0
+      - PORT=8081
+      - WEB_CONCURRENCY=1
+      - PYTHONWARNINGS=ignore
+      - POSTGRES_USER=username
+      - POSTGRES_PASS=password
+      - POSTGRES_DBNAME=postgis
+      - POSTGRES_HOST=database
+      - POSTGRES_PORT=5432
+      - DEBUG=TRUE
+    ports:
+      - "${MY_DOCKER_IP:-127.0.0.1}:8081:8081"
+    depends_on:
+    - database
+    command:
+      bash -c "bash /tmp/scripts/wait-for-it.sh database:5432 --timeout=30 && /start.sh"
+    volumes:
+      - ./dockerfiles/scripts:/tmp/scripts
+
   database:
     build:
       context: .

dockerfiles/Dockerfile dockerfiles/Dockerfile.gunicorndockerfiles/Dockerfile renamed to dockerfiles/Dockerfile.gunicorn

@@ -0,0 +1,21 @@
+ARG PYTHON_VERSION=3.11
+
+FROM python:${PYTHON_VERSION}-slim
+
+RUN apt-get update
+RUN apt-get install -y build-essential gcc
+
+WORKDIR /tmp
+
+COPY README.md README.md
+COPY LICENSE LICENSE
+COPY tipg/ tipg/
+COPY pyproject.toml pyproject.toml
+
+RUN pip install . uvicorn --no-cache-dir
+RUN rm -rf tipg/ README.md pyproject.toml LICENSE
+
+# http://www.uvicorn.org/settings/
+ENV HOST 0.0.0.0
+ENV PORT 80
+CMD uvicorn tipg.main:app --host ${HOST} --port ${PORT}