Changeset 982 for trunk/Dockerfile

Timestamp:

Feb 24, 2021, 6:20:56 PM (3 years ago)

Author:

djay

Message:

Update version 1.8.1-dev, use demos from github and build basic services in the Dockerfile

File:

• trunk/Dockerfile (modified) (4 diffs)

trunk/Dockerfile

@@ -18 +18 @@
     libxslt1.1 \
     gdal-bin \
+    libcgal13 \
     python3 \
     r-base \
@@ -108 +109 @@
     libxml2-dev \
     libxslt1-dev \
+    libcgal-dev \
 "
 WORKDIR /zoo-project
-COPY ./zoo-project/zoo-services/utils/status ./zoo-project/zoo-services/utils/status
+COPY ./zoo-project/zoo-services ./zoo-project/zoo-services
 
 # From zoo-kernel
@@ -133 +135 @@
     && make install \
     \
+    && cd ../../cgal \
+    && make \
+    && cp cgi-env/* /usr/lib/cgi-bin/ \
+    \
+    && cd .. \
+    && cd ../zoo-services/ogr/base-vect-ops \
+    && make \
+    && cp cgi-env/* /usr/lib/cgi-bin/ \
+    && cd ../.. \
+    \
+    && cd ../zoo-services/gdal/ \
+    && for i in contour dem grid profile translate warp ; do cd $i ; make && cp cgi-env/* /usr/lib/cgi-bin/ ; cd .. ; done \
+    \
     && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $BUILD_DEPS \
     && rm -rf /var/lib/apt/lists/*
+
+#
+# Optional zoo demos download.
+#
+FROM base AS demos
+ARG DEBIAN_FRONTEND=noninteractive
+ARG BUILD_DEPS=" \
+    git \
+"
+WORKDIR /zoo-project
+
+RUN set -ex \
+    && apt-get update && apt-get install -y --no-install-recommends $BUILD_DEPS \
+    \
+    && git clone https://github.com/ZOO-Project/examples.git 
 
 #
@@ -157 +187 @@
 COPY --from=builder2 /usr/com/zoo-project/ /usr/com/zoo-project/
 
+# From optional zoo demos
+COPY --from=demos /zoo-project/examples/data/ /usr/com/zoo-project/
+COPY --from=demos /zoo-project/examples/ /var/www/html/
+
+
 RUN set -ex \
     && apt-get update && apt-get install -y --no-install-recommends $RUN_DEPS \