From 0c7c7721d75210e6a610f6d4a9841cac646e4c02 Mon Sep 17 00:00:00 2001
From: Antoine Lavenant <Antoine.Lavenant@ign.fr>
Date: Thu, 30 May 2024 14:57:23 +0200
Subject: [PATCH] update docker

---
 Dockerfile             | 11 ++++++-----
 environment_docker.yml |  7 +++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 719ec36..3a1cbfd 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM mambaorg/micromamba:bullseye-slim as build
 
-COPY environment.yml /environment_docker.yml
+COPY environment_docker.yml /environment_docker.yml
  
 USER root
 RUN micromamba env create -f /environment_docker.yml
@@ -11,16 +11,17 @@ COPY src src
 COPY CMakeLists.txt CMakeLists.txt
 COPY macro macro
 
-RUN cmake -G"Unix Makefiles" -DCONDA_PREFIX=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release  
+RUN cmake -G"Unix Makefiles" -DCONDA_PREFIX=$CONDA_PREFIX -DCMAKE_BUILD_TYPE=Release
 RUN make -j4 install
   
 FROM debian:bullseye-slim
  
-COPY --from=build /opt/conda/envs/pdal_ign_plugin /opt/conda/envs/pdal_ign_plugin
-COPY --from=build /tmp/install/lib /tmp/install/lib
+COPY --from=build /opt/conda/envs/pdal_ign_plugin /opt/conda/envs/pdal_ign_plugin
+RUN mkdir -p /pdal_ign_plugin
+COPY --from=build /tmp/install/lib /pdal_ign_plugin/install/lib
 COPY --from=build /tmp/macro /macro 
 
 ENV PATH=$PATH:/opt/conda/envs/pdal_ign_plugin/bin/
 ENV PROJ_LIB=/opt/conda/envs/pdal_ign_plugin/share/proj/
-ENV PDAL_DRIVER_PATH=/tmp/install/lib
+ENV PDAL_DRIVER_PATH=/pdal_ign_plugin/install/lib
 
diff --git a/environment_docker.yml b/environment_docker.yml
index b49f938..7e23ef6 100755
--- a/environment_docker.yml
+++ b/environment_docker.yml
@@ -1,6 +1,13 @@
 name: pdal_ign_plugin
 channels:
   - conda-forge
+  - anaconda
 dependencies:
   - pdal
+  - python-pdal
+  - gdal
+# --------- pip & pip librairies --------- #
+  - pip
+  - pip:
+    - ign-pdal-tools