summaryrefslogtreecommitdiffstats
path: root/docker-files
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2022-10-29 10:55:59 +0200
committernicolargo <nicolas@nicolargo.com>2022-10-29 10:55:59 +0200
commit6116c2cc44e48b6fe17db8d798baad3a3ad4e7c4 (patch)
tree86b126fbd9bdf21780e98daa571930ab35959d04 /docker-files
parente0cc9710a419024b99bbe6662ac0488b95912b1b (diff)
Update Debian container to Python 3.11
Diffstat (limited to 'docker-files')
-rw-r--r--docker-files/debian.Dockerfile19
1 files changed, 11 insertions, 8 deletions
diff --git a/docker-files/debian.Dockerfile b/docker-files/debian.Dockerfile
index b8fbe540..9087bcf7 100644
--- a/docker-files/debian.Dockerfile
+++ b/docker-files/debian.Dockerfile
@@ -5,11 +5,11 @@
#
# WARNING: the version should be set.
-# Ex: Python 3.10 for 3.10-slim-buster
+# Ex: Python 3.11 for 3.11-slim-buster
# Note: ENV is for future running containers. ARG for building your Docker image.
-ARG IMAGE_VERSION=3.10-slim-buster
-ARG PYTHON_VERSION=3.10
+ARG PYTHON_IMAGE_VERSION=3.11
+ARG IMAGE_VERSION=${PYTHON_IMAGE_VERSION}-slim-buster
FROM python:${IMAGE_VERSION} as build
ARG PYTHON_VERSION
@@ -58,10 +58,11 @@ RUN CASS_DRIVER_NO_CYTHON=1 pip3 install --no-cache-dir --user -r optional-requi
FROM build as full
ARG PYTHON_VERSION
+ARG PYTHON_IMAGE_VERSION
COPY --from=buildRequirements /root/.local/bin /usr/local/bin/
-COPY --from=buildRequirements /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/local/lib/python${PYTHON_VERSION}/site-packages/
-COPY --from=buildOptionalRequirements /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/local/lib/python${PYTHON_VERSION}/site-packages/
+COPY --from=buildRequirements /root/.local/lib/python${PYTHON_IMAGE_VERSION}/site-packages /usr/local/lib/python${PYTHON_IMAGE_VERSION}/site-packages/
+COPY --from=buildOptionalRequirements /root/.local/lib/python${PYTHON_IMAGE_VERSION}/site-packages /usr/local/lib/python${PYTHON_IMAGE_VERSION}/site-packages/
COPY ./docker-compose/glances.conf /etc/glances.conf
# EXPOSE PORT (XMLRPC / WebUI)
@@ -79,6 +80,7 @@ CMD python3 -m glances -C /etc/glances.conf $GLANCES_OPT
# Create running images without any building dependency
FROM python:${IMAGE_VERSION} as minimal
ARG PYTHON_VERSION
+ARG PYTHON_IMAGE_VERSION
RUN apt-get update && \
apt-get install -y --no-install-recommends \
@@ -90,7 +92,7 @@ RUN apt-get update && \
apt-get clean && rm -rf /var/lib/apt/lists/*
COPY --from=buildRequirements /root/.local/bin /usr/local/bin/
-COPY --from=buildRequirements /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/local/lib/python${PYTHON_VERSION}/site-packages/
+COPY --from=buildRequirements /root/.local/lib/python${PYTHON_IMAGE_VERSION}/site-packages /usr/local/lib/python${PYTHON_IMAGE_VERSION}/site-packages/
COPY ./docker-compose/glances.conf /etc/glances.conf
# EXPOSE PORT (XMLRPC)
@@ -105,10 +107,11 @@ CMD python3 -m glances -C /etc/glances.conf $GLANCES_OPT
FROM full as dev
ARG PYTHON_VERSION
+ARG PYTHON_IMAGE_VERSION
COPY --from=buildRequirements /root/.local/bin /usr/local/bin/
-COPY --from=buildRequirements /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/lib/python${PYTHON_VERSION}/site-packages/
-COPY --from=buildOptionalRequirements /root/.local/lib/python${PYTHON_VERSION}/site-packages /usr/lib/python${PYTHON_VERSION}/site-packages/
+COPY --from=buildRequirements /root/.local/lib/python${PYTHON_IMAGE_VERSION}/site-packages /usr/lib/python${PYTHON_IMAGE_VERSION}/site-packages/
+COPY --from=buildOptionalRequirements /root/.local/lib/python${PYTHON_IMAGE_VERSION}/site-packages /usr/lib/python${PYTHON_IMAGE_VERSION}/site-packages/
COPY ./docker-compose/glances.conf /etc/glances.conf
# Copy the current Glances source code