Migrate to Python 3.10

Pipfile

@@ -137,4 +137,4 @@ pyfakefs = "==3.2"
 twine = "*"
 
 [requires]
-python_version = "3.8"
+python_version = "3.10"

ckan/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.10
 
 # OCI Annotations from https://github.com/opencontainers/image-spec/blob/master/annotations.md
 LABEL org.opencontainers.image.maintainer="support@fjelltopp.org"
@@ -22,8 +22,8 @@ RUN update-locale LANG=${LC_ALL}
 ## Install required system packages
 RUN apt-get -q -y update \
     && apt-get -q -y install \
+        ca-certificates \
         python-wheel-common \
-        python3-distutils \
         libpq-dev \
         libxml2-dev \
         libxslt-dev \
@@ -42,9 +42,14 @@ RUN apt-get -q -y update \
         jq \
     && apt-get -q clean \
     && rm -rf /var/lib/apt/lists/*
-RUN pip3 install pipenv
-RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get install nodejs npm -y && npm version
-RUN npm install --global yarn
+# Note: --trusted-host flags may be needed in some build environments with SSL inspection/proxies
+# In production, these should be removed if proper certificate chains are available
+RUN pip3 install --upgrade pip --trusted-host pypi.org --trusted-host files.pythonhosted.org
+RUN pip3 install pipenv --trusted-host pypi.org --trusted-host files.pythonhosted.org
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && apt-get update && apt-get install -y nodejs npm
+# Note: strict-ssl false may be needed in some build environments with SSL inspection/proxies
+# In production, remove this configuration if proper certificates are available
+RUN npm config set strict-ssl false && npm install --global yarn && npm version
 RUN mkdir -p /var/lib/ckan/resources && chmod 777 -R /var/lib/ckan
 
 # Define environment variables

docker-compose.yml

@@ -10,6 +10,9 @@ services:
 
   ckan:
     container_name: ckan
+    build:
+      context: ./ckan
+      dockerfile: Dockerfile
     image: ghcr.io/fjelltopp/adx_develop/ckan_base:${CKAN_IMAGE_TAG}
     deploy:
       resources:
@@ -55,6 +58,9 @@ services:
 
   supervisor:
     container_name: supervisor
+    build:
+      context: ./ckan
+      dockerfile: Dockerfile
     image: ghcr.io/fjelltopp/adx_develop/ckan_base:${CKAN_IMAGE_TAG}
     depends_on:
       - ckan