[feat] copy list_files.html into static/ folder; update dockerfile version
Browse files- Dockerfile +5 -3
- dockerfiles/dockerfile-samgis-base +3 -0
Dockerfile
CHANGED
|
@@ -1,4 +1,4 @@
|
|
| 1 |
-
FROM registry.gitlab.com/aletrn/gis-prediction:1.
|
| 2 |
|
| 3 |
# Include global arg in this stage of the build
|
| 4 |
ARG WORKDIR_ROOT="/var/task"
|
|
@@ -13,12 +13,13 @@ WORKDIR ${WORKDIR_ROOT}
|
|
| 13 |
COPY samgis ${WORKDIR_ROOT}/samgis
|
| 14 |
COPY wrappers ${WORKDIR_ROOT}/wrappers
|
| 15 |
COPY pyproject.toml poetry.lock README.md ${WORKDIR_ROOT}
|
| 16 |
-
RUN echo "# install samgis #" && pip install .
|
| 17 |
RUN mkdir ${WORKDIR_ROOT}/vis_output
|
| 18 |
|
| 19 |
RUN ls -l /usr/bin/which
|
| 20 |
RUN /usr/bin/which python
|
| 21 |
-
RUN python
|
|
|
|
| 22 |
RUN echo "PYTHONPATH: ${PYTHONPATH}."
|
| 23 |
RUN echo "PATH: ${PATH}."
|
| 24 |
RUN echo "WORKDIR_ROOT: ${WORKDIR_ROOT}."
|
|
@@ -33,6 +34,7 @@ RUN python -c "import loguru"
|
|
| 33 |
RUN python -c "import onnxruntime"
|
| 34 |
RUN python -c "import rasterio"
|
| 35 |
RUN python -c "import uvicorn"
|
|
|
|
| 36 |
RUN df -h
|
| 37 |
RUN ls -l ${WORKDIR_ROOT}/samgis/
|
| 38 |
RUN ls -l ${WORKDIR_ROOT}/wrappers/
|
|
|
|
| 1 |
+
FROM registry.gitlab.com/aletrn/gis-prediction:1.5.0
|
| 2 |
|
| 3 |
# Include global arg in this stage of the build
|
| 4 |
ARG WORKDIR_ROOT="/var/task"
|
|
|
|
| 13 |
COPY samgis ${WORKDIR_ROOT}/samgis
|
| 14 |
COPY wrappers ${WORKDIR_ROOT}/wrappers
|
| 15 |
COPY pyproject.toml poetry.lock README.md ${WORKDIR_ROOT}
|
| 16 |
+
RUN . ${WORKDIR_ROOT}/.venv && which python && echo "# install samgis #" && pip install .
|
| 17 |
RUN mkdir ${WORKDIR_ROOT}/vis_output
|
| 18 |
|
| 19 |
RUN ls -l /usr/bin/which
|
| 20 |
RUN /usr/bin/which python
|
| 21 |
+
RUN python --version
|
| 22 |
+
RUN pip list
|
| 23 |
RUN echo "PYTHONPATH: ${PYTHONPATH}."
|
| 24 |
RUN echo "PATH: ${PATH}."
|
| 25 |
RUN echo "WORKDIR_ROOT: ${WORKDIR_ROOT}."
|
|
|
|
| 34 |
RUN python -c "import onnxruntime"
|
| 35 |
RUN python -c "import rasterio"
|
| 36 |
RUN python -c "import uvicorn"
|
| 37 |
+
RUN python -c "import jinja2"
|
| 38 |
RUN df -h
|
| 39 |
RUN ls -l ${WORKDIR_ROOT}/samgis/
|
| 40 |
RUN ls -l ${WORKDIR_ROOT}/wrappers/
|
dockerfiles/dockerfile-samgis-base
CHANGED
|
@@ -67,6 +67,7 @@ RUN echo "RUNTIME: remove libz.s* to force upgrade" && rm /usr/lib/${ARCH}-linux
|
|
| 67 |
COPY --from=builder_global /usr/lib/${ARCH}-linux-gnu/libz.so* /usr/lib/${ARCH}-linux-gnu/
|
| 68 |
RUN echo "RUNTIME: check libz.s* after copy" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so*
|
| 69 |
COPY --from=builder_global ${WORKDIR_ROOT}/.venv ${WORKDIR_ROOT}/.venv
|
|
|
|
| 70 |
|
| 71 |
RUN echo "new WORKDIR_ROOT after hidden venv copy => ${WORKDIR_ROOT}"
|
| 72 |
RUN ls -ld ${WORKDIR_ROOT}/
|
|
@@ -120,3 +121,5 @@ RUN mkdir ${FASTAPI_STATIC}
|
|
| 120 |
COPY ./machine_learning_models ${WORKDIR_ROOT}/machine_learning_models
|
| 121 |
COPY --from=node_prod_deps /appnode/node_modules* ${FASTAPI_STATIC}/node_modules
|
| 122 |
COPY --from=node_build /appnode/dist* ${FASTAPI_STATIC}/dist
|
|
|
|
|
|
|
|
|
| 67 |
COPY --from=builder_global /usr/lib/${ARCH}-linux-gnu/libz.so* /usr/lib/${ARCH}-linux-gnu/
|
| 68 |
RUN echo "RUNTIME: check libz.s* after copy" && ls -l /usr/lib/${ARCH}-linux-gnu/libz.so*
|
| 69 |
COPY --from=builder_global ${WORKDIR_ROOT}/.venv ${WORKDIR_ROOT}/.venv
|
| 70 |
+
RUN . ${WORKDIR_ROOT}/.venv && which python && pip list
|
| 71 |
|
| 72 |
RUN echo "new WORKDIR_ROOT after hidden venv copy => ${WORKDIR_ROOT}"
|
| 73 |
RUN ls -ld ${WORKDIR_ROOT}/
|
|
|
|
| 121 |
COPY ./machine_learning_models ${WORKDIR_ROOT}/machine_learning_models
|
| 122 |
COPY --from=node_prod_deps /appnode/node_modules* ${FASTAPI_STATIC}/node_modules
|
| 123 |
COPY --from=node_build /appnode/dist* ${FASTAPI_STATIC}/dist
|
| 124 |
+
COPY static/list_files.html ${FASTAPI_STATIC}/
|
| 125 |
+
RUN ls -l ${FASTAPI_STATIC}/
|