Changeset 968 for trunk/Dockerfile

Timestamp:

Dec 18, 2020, 7:11:27 PM (4 years ago)

Author:

djay

Message:

Add websocketd container to docker-compose and make the OGC API - Processes and it basic UI available.

File:

• trunk/Dockerfile (modified) (8 diffs)

trunk/Dockerfile

@@ -2 +2 @@
 # Base: Ubuntu 18.04 with updates and external packages
 #
-FROM ubuntu:bionic-20200713 AS base
+FROM ubuntu:bionic-20201119 AS base
 ARG DEBIAN_FRONTEND=noninteractive
 ARG BUILD_DEPS=" \
@@ -15 +15 @@
     libmozjs185-dev \
     libpq5 \
-    libpython2.7 \
+    libpython3.6 \
     libxslt1.1 \
     gdal-bin \
-    python \
+    python3 \
     r-base \
+    python3-pip\
 "
 RUN set -ex \
@@ -54 +55 @@
     libxml2-dev \
     libxslt1-dev \
-    python-dev \
+    python3-dev \
     uuid-dev \
     r-base-dev \
@@ -68 +69 @@
     && cd ./zoo-project/zoo-kernel \
     && autoconf \
-    && ./configure --with-python --with-js=/usr --with-mapserver=/usr --with-ms-version=7 --with-json=/usr --with-db-backend --prefix=/usr \
+    && ./configure --with-python=/usr --with-pyvers=3.6 --with-js=/usr --with-mapserver=/usr --with-ms-version=7 --with-json=/usr --with-db-backend --prefix=/usr \
     && make \
     && make install \
@@ -77 +78 @@
     && cp ../zoo-services/hello-js/cgi-env/* /usr/lib/cgi-bin/ \
     && cp ../zoo-api/js/* /usr/lib/cgi-bin/ \
+    && cp ../zoo-services/utils/open-api/cgi-env/* /usr/lib/cgi-bin/ \
     && cp ../zoo-services/hello-py/cgi-env/* /usr/lib/cgi-bin/ \
     && cp ../zoo-services/hello-js/cgi-env/* /usr/lib/cgi-bin/ \
@@ -112 +114 @@
 # From zoo-kernel
 COPY --from=builder1 /usr/lib/cgi-bin/ /usr/lib/cgi-bin/
-COPY --from=builder1 /usr/lib/libzoo_service.so.1.5 /usr/lib/libzoo_service.so.1.5
+COPY --from=builder1 /usr/lib/libzoo_service.so.1.8 /usr/lib/libzoo_service.so.1.8
 COPY --from=builder1 /usr/lib/libzoo_service.so /usr/lib/libzoo_service.so
 COPY --from=builder1 /usr/com/zoo-project/ /usr/com/zoo-project/
@@ -146 +148 @@
 # From zoo-kernel
 COPY --from=builder1 /usr/lib/cgi-bin/ /usr/lib/cgi-bin/
-COPY --from=builder1 /usr/lib/libzoo_service.so.1.5 /usr/lib/libzoo_service.so.1.5
+COPY --from=builder1 /usr/lib/libzoo_service.so.1.8 /usr/lib/libzoo_service.so.1.8
 COPY --from=builder1 /usr/lib/libzoo_service.so /usr/lib/libzoo_service.so
 COPY --from=builder1 /usr/com/zoo-project/ /usr/com/zoo-project/
@@ -159 +161 @@
     \
     && rm -rf /var/lib/apt/lists/* \
-    && a2enmod cgi
+    && pip3 install Cheetah3 redis\
+    && sed "s:AllowOverride None:AllowOverride All:g" -i /etc/apache2/apache2.conf \
+    && a2enmod cgi rewrite
 
 EXPOSE 80