Bump dependencies and move to 3.13

Signed-off-by: Kristian Berg <kristian.berg@tietoevry.com>

Author: kriberg

.github/workflows/dockerimage.yml

@@ -1,22 +1,20 @@
 name: Docker Image CI
-on: 
+on:
   workflow_dispatch:
   push:
-    branches: master
+    branches: [master]
 jobs:
   build:
     runs-on: ubuntu-latest
-    if: 
     steps:
-    - uses: actions/checkout@v4
-    - name: Install git
-      run: sudo apt-get install git
-    - name: Quay login
-      uses: docker/login-action@v3.0.0
-      with:
-        registry: quay.io
-        username: ${{ secrets.QUAY_USER }}
-        password: ${{ secrets.QUAY_TOKEN }}
-    - name: Build images
-      run: make all
-
+      - uses: actions/checkout@v3
+      - name: Install git
+        run: sudo apt-get install git
+      - name: Quay login
+        uses: docker/login-action@v3.1.0
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USER }}
+          password: ${{ secrets.QUAY_TOKEN }}
+      - name: Build images
+        run: make all

Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/evryfs/base-python:3.12.0
+FROM quay.io/evryfs/base-python:3.13.3
 ARG BUILD_DATE
 ARG BUILD_URL
 ARG GIT_URL
@@ -8,34 +8,32 @@ ARG UVICORN_VERSION
 ARG GUNICORN_VERSION
 ARG VERSION
 LABEL maintainer="Kristian Berg <kristian.berg@evry.com>" \
-      org.opencontainers.image.title="base-python-asgi" \
-      org.opencontainers.image.created=$BUILD_DATE \
-      org.opencontainers.image.authors="Kristian Berg <kristian.berg@evry.com>" \
-      org.opencontainers.image.url=$BUILD_URL \
-      org.opencontainers.image.documentation="https://github.com/evryfs/base-python-asgi/" \
-      org.opencontainers.image.source=$GIT_URL \
-      org.opencontainers.image.version=$VERSION \
-      org.opencontainers.image.revision=$GIT_COMMIT \
-      org.opencontainers.image.vendor="TietoEvry Financial Services" \
-      org.opencontainers.image.licenses="proprietary-license" \
-      org.opencontainers.image.description="Base image for ASGI apps using python $PY_VER with uvicorn $UVICORN_VERSION and gunicorn $GUNICORN_VERSION"
+  org.opencontainers.image.title="base-python-asgi" \
+  org.opencontainers.image.created=$BUILD_DATE \
+  org.opencontainers.image.authors="Kristian Berg <kristian.berg@tietoevry.com>" \
+  org.opencontainers.image.url=$BUILD_URL \
+  org.opencontainers.image.documentation="https://github.com/evryfs/base-python-asgi/" \
+  org.opencontainers.image.source=$GIT_URL \
+  org.opencontainers.image.version=$VERSION \
+  org.opencontainers.image.revision=$GIT_COMMIT \
+  org.opencontainers.image.vendor="Tietoevry Banking" \
+  org.opencontainers.image.licenses="proprietary-license" \
+  org.opencontainers.image.description="Base image for ASGI apps using python $PY_VER with uvicorn $UVICORN_VERSION and gunicorn $GUNICORN_VERSION"
 
 ENV UVICORN_PORT 8000
 ENV UVICORN_HOST 0.0.0.0
 ENV CONTEXT_ROOT ""
 USER root
 RUN apt-get update && \
-    apt-get install -y gcc && \
-    apt-get -y clean && \
-    rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/* /var/tmp/*
+  apt-get install -y gcc && \
+  apt-get -y clean && \
+  rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/* /var/tmp/*
 COPY requirements.txt /tmp/requirements.txt
-RUN pip install -r /tmp/requirements.txt
+RUN pip install --no-cache-dir -r /tmp/requirements.txt
 RUN apt-get purge -y gcc && rm -rf /var/lib/apt/lists/*
 COPY start_uvicorn /bin/
 RUN chmod 755 /bin/start_uvicorn
 USER 1001:100
 WORKDIR /app
 EXPOSE $UVICORN_PORT
-HEALTHCHECK --interval=30s --timeout=5s --retries=3 \
-    CMD curl -I --silent --fail "http://localhost:$UVICORN_PORT/$CONTEXT_ROOT" || exit 1
 ENTRYPOINT ["/bin/start_uvicorn"]

Makefile

@@ -7,8 +7,7 @@ GIT_COMMIT := $(shell git rev-parse HEAD)
 PY_VER := $(shell head -n1 Dockerfile|cut -d":" -f2|cut -d"-" -f1)
 PY_MINOR_VER := $(shell head -n1 Dockerfile|cut -d":" -f2|cut -d"-" -f1|cut -d"." -f1,2)
 UVICORN_VERSION ?= $(shell grep uvicorn requirements.txt|cut -d"=" -f3)
-GUNICORN_VERSION ?= $(shell grep gunicorn requirements.txt|cut -d"=" -f3)
-VERSION = "$(PY_VER)-$(UVICORN_VERSION)-$(GUNICORN_VERSION)"
+VERSION = "$(PY_VER)-$(UVICORN_VERSION)"
 
 all: latest push
 
@@ -23,7 +22,6 @@ latest:
 		-t quay.io/evryfs/base-python-asgi:"$(PY_MINOR_VER)"-stable \
 		-t quay.io/evryfs/base-python-asgi:stable \
 		--build-arg UVICORN_VERSION="$(UVICORN_VERSION)" \
-		--build-arg GUNICORN_VERSION="$(GUNICORN_VERSION)" \
 		--build-arg VERSION="$(VERSION)" \
 		--build-arg BUILD_DATE="$(BUILD_DATE)" \
 		--build-arg BUILD_URL="$(BUILD_URL)" \

README.md

@@ -1,9 +1,9 @@
-# EVRY FS python ASGI base image
+# Python ASGI base image
 
 [![Docker Repository on Quay](https://quay.io/repository/evryfs/base-python-asgi/status "Docker Repository on Quay")](https://quay.io/repository/evryfs/base-python-asgi)
 
 This image forms the basis for running python ASGI applications. It is based on
-the EVRY python base image and uses uvicorn.
+the Tietoevry python base image and uses uvicorn.
 
 ## Usage
 
@@ -12,12 +12,12 @@ environment flags to control how the ASGI application is started.
 
 ### Available flags
 
-Flag              | Default           | Comment 
------------------ | ----------------- | ---------------------------------------------------
-UVICORN_PORT      | 8000              | Application port.
-UVICORN_HOST      | 0.0.0.0           | Application bind address.
-UVICORN_LOG_LEVEL | info              | Set uvicorn log level.
-CONTEXT_ROOT      | None              | Context root where application is served.
+| Flag              | Default | Comment                                   |
+| ----------------- | ------- | ----------------------------------------- |
+| UVICORN_PORT      | 8000    | Application port.                         |
+| UVICORN_HOST      | 0.0.0.0 | Application bind address.                 |
+| UVICORN_LOG_LEVEL | info    | Set uvicorn log level.                    |
+| CONTEXT_ROOT      | None    | Context root where application is served. |
 
 ### Creating a Dockerfile
 
@@ -26,7 +26,7 @@ Dockerfile based on this. Then add your python sauce to the container and set
 the name of the ASGI module with `CMD ["module:callable"]`.
 
 ```dockerfile
-FROM quay.io/evryfs/base-python-asgi:3.9-stable
+FROM quay.io/evryfs/base-python-asgi:3.13-stable
 ARG BUILD_DATE
 ARG BUILD_URL
 ARG GIT_URL
@@ -42,7 +42,7 @@ LABEL maintainer="Your Name <your.email.here@evry.com>"
       org.opencontainers.image.source=$GIT_URL
       org.opencontainers.image.version="<version number>"
       org.opencontainers.image.revision=$GIT_COMMIT
-      org.opencontainers.image.vendor="EVRY Financial Services"
+      org.opencontainers.image.vendor="Tietoevry Banking"
       org.opencontainers.image.licenses="proprietary-license"
       org.opencontainers.image.description="<system description>"
 
@@ -51,6 +51,6 @@ CMD ["asgi_module:app"]
 ```
 
 The default workdir for this image is /app, so any sauce will be copied there.
-Remember to reset WORKDIR to /app, if you do additional steps in your
-derivative image. The wrapper scripts depends on the module being either in
-python's site-packages or present in the current directory.
+Remember to reset WORKDIR to /app, if you do additional steps in your derivative
+image. The wrapper scripts depends on the module being either in python's
+site-packages or present in the current directory.

requirements.txt

@@ -1,2 +1 @@
-uvicorn==0.24.0.post1
-gunicorn==20.1.0
+uvicorn==0.34.2