From bc837dd3a4a9c19632cf1718051fd307693a8b30 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: Sat, 6 Jul 2024 13:58:16 +0800 Subject: [PATCH] feat: upgrade base image to fedora 39 Signed-off-by: Chenxiong Qi --- Dockerfile-base | 2 +- Dockerfile-web | 2 +- Dockerfile-worker | 2 +- httpd.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile-base b/Dockerfile-base index c19ddce..8675907 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:38 +FROM registry.fedoraproject.org/fedora:39 ARG version=latest # For mod_wsgi to store socket file. diff --git a/Dockerfile-web b/Dockerfile-web index 767f457..c7dfdee 100644 --- a/Dockerfile-web +++ b/Dockerfile-web @@ -22,7 +22,7 @@ RUN mkdir bootstrap ${wsgi_dir} && \ # This seems useless since the parent image already sets it as WORKDIR WORKDIR /project -COPY product.py ./venv/lib64/python3.11/site-packages/tcms/settings/product.py +COPY product.py ./venv/lib64/python3.12/site-packages/tcms/settings/product.py COPY httpd.conf /etc/httpd/conf/httpd.conf COPY entrypoint.sh . RUN chmod 755 entrypoint.sh diff --git a/Dockerfile-worker b/Dockerfile-worker index 2aa3ec7..fe63c85 100644 --- a/Dockerfile-worker +++ b/Dockerfile-worker @@ -5,7 +5,7 @@ FROM ${ns}/base:${version} LABEL org.opencontainers.image.description="Nitrate worker image to run asynchronous tasks." WORKDIR /project -COPY product.py ./venv/lib64/python3.11/site-packages/tcms/settings/product.py +COPY product.py ./venv/lib64/python3.12/site-packages/tcms/settings/product.py VOLUME ["/project/uploads"] CMD ["/project/venv/bin/celery", "-A", "tcms", "worker", "-l", "INFO"] diff --git a/httpd.conf b/httpd.conf index c1d8599..5191750 100644 --- a/httpd.conf +++ b/httpd.conf @@ -20,7 +20,7 @@ MaxRequestsPerChild 0 WSGIDaemonProcess nitrate python-path=/project/nitrate-config python-home=/project/venv WSGIProcessGroup nitrate WSGIApplicationGroup %{GLOBAL} -WSGIScriptAlias / /project/venv/lib/python3.11/site-packages/tcms/wsgi.py +WSGIScriptAlias / /project/venv/lib/python3.12/site-packages/tcms/wsgi.py WSGISocketPrefix /var/run/wsgi/nitrate-wsgi