alessandro trinca tornidor commited on
Commit
64ae857
·
1 Parent(s): 3d3058a

ci: change python:3.12 image from bookworm to trixie, remove zlib1g package installation

Browse files
Files changed (2) hide show
  1. Dockerfile +1 -1
  2. dockerfiles/dockerfile-samgis-base +2 -20
Dockerfile CHANGED
@@ -1,4 +1,4 @@
1
- FROM registry.gitlab.com/aletrn/gis-prediction:1.11.9
2
 
3
  # Include global arg in this stage of the build
4
  ARG WORKDIR_ROOT="/var/task"
 
1
+ FROM registry.gitlab.com/aletrn/gis-prediction:1.11.10
2
 
3
  # Include global arg in this stage of the build
4
  ARG WORKDIR_ROOT="/var/task"
dockerfiles/dockerfile-samgis-base CHANGED
@@ -10,7 +10,7 @@ ARG POETRY_CACHE_DIR=/tmp/poetry_cache
10
  ARG HOME_USER=/home/python
11
 
12
 
13
- FROM python:3.12-bookworm AS builder_global
14
 
15
  ARG ARCH
16
  ARG WORKDIR_ROOT
@@ -19,7 +19,6 @@ ARG POETRY_NO_INTERACTION
19
  ARG POETRY_VIRTUALENVS_IN_PROJECT
20
  ARG POETRY_VIRTUALENVS_CREATE
21
  ARG POETRY_CACHE_DIR
22
- ARG ZLIB1G="http://ftp.it.debian.org/debian/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_amd64.deb"
23
 
24
  RUN echo "ARCH: $ARCH ..."
25
 
@@ -34,15 +33,7 @@ WORKDIR ${WORKDIR_ROOT}
34
  COPY --chown=python:python requirements_poetry.txt pyproject.toml poetry.lock README.md ${WORKDIR_ROOT}/
35
 
36
  # avoid segment-geospatial exception caused by missing libGL.so.1 library
37
- RUN echo "BUILDER: check libz.s* before start:" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so* /lib/${ARCH}-linux-gnu/libz.so*
38
  RUN apt update && apt install -y libgl1 curl python3-pip libexpat1 && apt clean
39
- RUN curl -o /root/zlib1g-1.3.deb ${ZLIB1G}
40
- RUN dpkg -i /root/zlib1g-1.3.deb
41
- RUN rm /lib/x86_64-linux-gnu/libz.so.1.2* || echo "BUILDER: no /lib/${ARCH}-linux-gnu/libz.so.1.2* found"
42
- RUN rm /usr/lib/${ARCH}-linux-gnu/libz.so.1.2* || echo "BUILDER: no /usr/lib/${ARCH}-linux-gnu/libz.so.1.2* found"
43
- RUN ln -sf /usr/lib/${ARCH}-linux-gnu/libz.so.1 /usr/lib/${ARCH}-linux-gnu/libz.so
44
- RUN ln -sf /lib/${ARCH}-linux-gnu/libz.so.1 /lib/${ARCH}-linux-gnu/libz.so
45
- RUN echo "BUILDER: check libz.s* after install from trixie" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so* /lib/${ARCH}-linux-gnu/libz.so*
46
 
47
  # poetry installation path is NOT within ${WORKDIR_ROOT}: not needed for runtime docker image
48
  RUN python -m pip install -r ${WORKDIR_ROOT}/requirements_poetry.txt
@@ -53,7 +44,7 @@ RUN echo "# poetry config --list #" && poetry config --list
53
  RUN poetry install --no-cache
54
 
55
 
56
- FROM python:3.12-slim-bookworm AS runtime
57
 
58
  ARG ARCH
59
  ARG WORKDIR_ROOT
@@ -71,15 +62,6 @@ RUN ls -ld ${HOME_USER}
71
  RUN ls -lA ${HOME_USER}
72
  RUN mkdir ${WORKDIR_ROOT} && chown python:python ${WORKDIR_ROOT}
73
 
74
- RUN echo "RUNTIME: check libz.s* before start:" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so* /lib/${ARCH}-linux-gnu/libz.so*
75
- COPY --from=builder_global /root/zlib1g-1.3.deb /root/zlib1g-1.3.deb
76
- RUN dpkg -i /root/zlib1g-1.3.deb
77
- RUN rm /lib/x86_64-linux-gnu/libz.so.1.2* || echo "RUNTIME: no /lib/${ARCH}-linux-gnu/libz.so.1.2* found"
78
- RUN rm /usr/lib/${ARCH}-linux-gnu/libz.so.1.2* || echo "RUNTIME: no /usr/lib/${ARCH}-linux-gnu/libz.so.1.2* found"
79
- RUN ln -sf /usr/lib/${ARCH}-linux-gnu/libz.so.1 /usr/lib/${ARCH}-linux-gnu/libz.so
80
- RUN ln -sf /lib/${ARCH}-linux-gnu/libz.so.1 /lib/${ARCH}-linux-gnu/libz.so
81
- RUN echo "RUNTIME: check libz.s* after install from trixie" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so* /lib/${ARCH}-linux-gnu/libz.so*
82
-
83
  RUN echo "RUNTIME: check libexpat.so*, libGL.so* before start" && ls -l /usr/lib/${ARCH}-linux-gnu/libexpat.so* /usr/lib/${ARCH}-linux-gnu/libGL.so* || echo "libraries libexpat.so*, libGL.so* not found"
84
  COPY --from=builder_global /usr/lib/${ARCH}-linux-gnu/libGL.so* /usr/lib/${ARCH}-linux-gnu/
85
  COPY --from=builder_global /lib/${ARCH}-linux-gnu/libexpat.so* /lib/${ARCH}-linux-gnu/
 
10
  ARG HOME_USER=/home/python
11
 
12
 
13
+ FROM python:3.12-trixie AS builder_global
14
 
15
  ARG ARCH
16
  ARG WORKDIR_ROOT
 
19
  ARG POETRY_VIRTUALENVS_IN_PROJECT
20
  ARG POETRY_VIRTUALENVS_CREATE
21
  ARG POETRY_CACHE_DIR
 
22
 
23
  RUN echo "ARCH: $ARCH ..."
24
 
 
33
  COPY --chown=python:python requirements_poetry.txt pyproject.toml poetry.lock README.md ${WORKDIR_ROOT}/
34
 
35
  # avoid segment-geospatial exception caused by missing libGL.so.1 library
 
36
  RUN apt update && apt install -y libgl1 curl python3-pip libexpat1 && apt clean
 
 
 
 
 
 
 
37
 
38
  # poetry installation path is NOT within ${WORKDIR_ROOT}: not needed for runtime docker image
39
  RUN python -m pip install -r ${WORKDIR_ROOT}/requirements_poetry.txt
 
44
  RUN poetry install --no-cache
45
 
46
 
47
+ FROM python:3.12-slim-trixie AS runtime
48
 
49
  ARG ARCH
50
  ARG WORKDIR_ROOT
 
62
  RUN ls -lA ${HOME_USER}
63
  RUN mkdir ${WORKDIR_ROOT} && chown python:python ${WORKDIR_ROOT}
64
 
 
 
 
 
 
 
 
 
 
65
  RUN echo "RUNTIME: check libexpat.so*, libGL.so* before start" && ls -l /usr/lib/${ARCH}-linux-gnu/libexpat.so* /usr/lib/${ARCH}-linux-gnu/libGL.so* || echo "libraries libexpat.so*, libGL.so* not found"
66
  COPY --from=builder_global /usr/lib/${ARCH}-linux-gnu/libGL.so* /usr/lib/${ARCH}-linux-gnu/
67
  COPY --from=builder_global /lib/${ARCH}-linux-gnu/libexpat.so* /lib/${ARCH}-linux-gnu/