alessandro trinca tornidor
commited on
Commit
·
233631f
1
Parent(s):
45f1577
ci: workaround for missing /home folder within the docker image, bump to version 1.11.7
Browse files- Dockerfile +5 -1
- dockerfiles/dockerfile-samgis-base +9 -0
- pyproject.toml +2 -2
Dockerfile
CHANGED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
-
FROM registry.gitlab.com/aletrn/gis-prediction:1.11.
|
| 2 |
|
| 3 |
# Include global arg in this stage of the build
|
| 4 |
ARG WORKDIR_ROOT="/var/task"
|
|
@@ -7,9 +7,13 @@ ENV WRITE_TMP_ON_DISK=""
|
|
| 7 |
ENV MOUNT_GRADIO_APP=""
|
| 8 |
ENV VITE__STATIC_INDEX_URL="/static"
|
| 9 |
ENV VITE__INDEX_URL="/"
|
|
|
|
| 10 |
|
| 11 |
# Set working directory to function root directory
|
| 12 |
WORKDIR ${WORKDIR_ROOT}
|
|
|
|
|
|
|
|
|
|
| 13 |
|
| 14 |
COPY --chown=python:python app.py ${WORKDIR_ROOT}/
|
| 15 |
COPY --chown=python:python pyproject.toml poetry.lock README.md ${WORKDIR_ROOT}
|
|
|
|
| 1 |
+
FROM registry.gitlab.com/aletrn/gis-prediction:1.11.7
|
| 2 |
|
| 3 |
# Include global arg in this stage of the build
|
| 4 |
ARG WORKDIR_ROOT="/var/task"
|
|
|
|
| 7 |
ENV MOUNT_GRADIO_APP=""
|
| 8 |
ENV VITE__STATIC_INDEX_URL="/static"
|
| 9 |
ENV VITE__INDEX_URL="/"
|
| 10 |
+
ENV HOME_USER=/home/python
|
| 11 |
|
| 12 |
# Set working directory to function root directory
|
| 13 |
WORKDIR ${WORKDIR_ROOT}
|
| 14 |
+
# workaround for missing /home folder
|
| 15 |
+
RUN ls -ld ${HOME_USER}
|
| 16 |
+
RUN ls -lA ${HOME_USER}
|
| 17 |
|
| 18 |
COPY --chown=python:python app.py ${WORKDIR_ROOT}/
|
| 19 |
COPY --chown=python:python pyproject.toml poetry.lock README.md ${WORKDIR_ROOT}
|
dockerfiles/dockerfile-samgis-base
CHANGED
|
@@ -7,6 +7,7 @@ ARG POETRY_NO_INTERACTION=1
|
|
| 7 |
ARG POETRY_VIRTUALENVS_IN_PROJECT=1
|
| 8 |
ARG POETRY_VIRTUALENVS_CREATE=1
|
| 9 |
ARG POETRY_CACHE_DIR=/tmp/poetry_cache
|
|
|
|
| 10 |
|
| 11 |
|
| 12 |
FROM python:3.12-bookworm AS builder_global
|
|
@@ -56,10 +57,18 @@ FROM python:3.12-slim-bookworm AS runtime
|
|
| 56 |
|
| 57 |
ARG ARCH
|
| 58 |
ARG WORKDIR_ROOT
|
|
|
|
| 59 |
|
| 60 |
ENV VIRTUAL_ENV=${WORKDIR_ROOT}/.venv PATH="${WORKDIR_ROOT}/.venv/bin:$PATH"
|
| 61 |
|
|
|
|
|
|
|
| 62 |
RUN groupadd -g 999 python && useradd -r -u 999 -g python python
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 63 |
RUN mkdir ${WORKDIR_ROOT} && chown python:python ${WORKDIR_ROOT}
|
| 64 |
|
| 65 |
RUN echo "RUNTIME: check libz.s* before start:" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so* /lib/${ARCH}-linux-gnu/libz.so*
|
|
|
|
| 7 |
ARG POETRY_VIRTUALENVS_IN_PROJECT=1
|
| 8 |
ARG POETRY_VIRTUALENVS_CREATE=1
|
| 9 |
ARG POETRY_CACHE_DIR=/tmp/poetry_cache
|
| 10 |
+
ARG HOME_USER=/home/python
|
| 11 |
|
| 12 |
|
| 13 |
FROM python:3.12-bookworm AS builder_global
|
|
|
|
| 57 |
|
| 58 |
ARG ARCH
|
| 59 |
ARG WORKDIR_ROOT
|
| 60 |
+
ARG HOME_USER
|
| 61 |
|
| 62 |
ENV VIRTUAL_ENV=${WORKDIR_ROOT}/.venv PATH="${WORKDIR_ROOT}/.venv/bin:$PATH"
|
| 63 |
|
| 64 |
+
# workaround for missing /home folder
|
| 65 |
+
RUN mkdir -p /home
|
| 66 |
RUN groupadd -g 999 python && useradd -r -u 999 -g python python
|
| 67 |
+
RUN ls -l /home
|
| 68 |
+
RUN ls -ld /home
|
| 69 |
+
RUN mkdir -p ${HOME_USER} ${HOME_USER}/.config && chown python:python -R ${HOME_USER}
|
| 70 |
+
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*
|
pyproject.toml
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
[tool.poetry]
|
| 2 |
name = "samgis"
|
| 3 |
-
version = "1.11.
|
| 4 |
description = "A backend for machine learning instance segmentation on geospatial data even without dedicated graphics cards."
|
| 5 |
authors = ["alessandro trinca tornidor <alessandro@trinca.tornidor.com>"]
|
| 6 |
license = "MIT license"
|
|
@@ -9,7 +9,7 @@ package-mode = false
|
|
| 9 |
|
| 10 |
[metadata]
|
| 11 |
name = "samgis"
|
| 12 |
-
version = "1.11.
|
| 13 |
|
| 14 |
[tool.poetry.urls]
|
| 15 |
Source = "https://github.com/trincadev/samgis-be"
|
|
|
|
| 1 |
[tool.poetry]
|
| 2 |
name = "samgis"
|
| 3 |
+
version = "1.11.7"
|
| 4 |
description = "A backend for machine learning instance segmentation on geospatial data even without dedicated graphics cards."
|
| 5 |
authors = ["alessandro trinca tornidor <alessandro@trinca.tornidor.com>"]
|
| 6 |
license = "MIT license"
|
|
|
|
| 9 |
|
| 10 |
[metadata]
|
| 11 |
name = "samgis"
|
| 12 |
+
version = "1.11.7"
|
| 13 |
|
| 14 |
[tool.poetry.urls]
|
| 15 |
Source = "https://github.com/trincadev/samgis-be"
|