Changeset 982 for trunk

Timestamp:

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

Author:

djay

Message:

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

Location:

trunk

Files:

• Dockerfile (modified) (4 diffs)
• docker-compose.yml (modified) (1 diff)
• zoo-project/HISTORY.txt (modified) (1 diff)
• zoo-project/zoo-kernel/Makefile.in (modified) (1 diff)
• zoo-project/zoo-kernel/configure.ac (modified) (1 diff)
• zoo-project/zoo-kernel/server_internal.c (modified) (1 diff)
• zoo-project/zoo-kernel/zoo_service_loader.c (modified) (1 diff)
• zoo-project/zoo-services/cgal/voronoi.c (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 \

trunk/docker-compose.yml

@@ -14 +14 @@
       - ./zoo-project/zoo-services/utils/open-api/templates/index.html:/var/www/index.html
       - ./zoo-project/zoo-services/utils/open-api/static:/var/www/html/static
+      - ../zoo-demos/zoo-demos-202102/examples:/var/www/html/examples
+      - ../zoo-demos/zoo-demos-202102/data/topofr.tif:/usr/com/zoo-project/topofr.tif
     depends_on:
       - pgbouncer

trunk/zoo-project/HISTORY.txt

@@ +1 @@
+Version 1.8.1
+  * Deploy demo HTML UI from github from the Dockerfile
+  * Add demo ZOO-Services build in the Dockerfile
 Version 1.8.0
   * Support raw response in OGC API - Processes

trunk/zoo-project/zoo-kernel/Makefile.in

@@ -4 +4 @@
 
 version.h: Makefile
-        echo "#define ZOO_VERSION \"1.8.0 `svnversion`\"" > version.h
+        echo "#define ZOO_VERSION \"1.8.1-dev `svnversion`\"" > version.h
         echo "@ETC_DEF@" >> version.h
         echo "#define LOCALEDIR \"@localedir@\"" >>  version.h

trunk/zoo-project/zoo-kernel/configure.ac

@@ -1 @@
-AC_INIT([ZOO Kernel], [1.8.0], [bugs@zoo-project.org])
+AC_INIT([ZOO Kernel], [1.8.1-dev], [bugs@zoo-project.org])
 
 AC_CONFIG_MACRO_DIR([macros])

trunk/zoo-project/zoo-kernel/server_internal.c

@@ -375 +375 @@
   zStatStruct f_status;
   int s=zStat(filename, &f_status);
-  sprintf(rsize,"%lld",f_status.st_size);
+  sprintf(rsize,"%ld",f_status.st_size);
   if(getMap(content,"storage")==NULL){
     map* tmpMap1=getMap(content,"value");

trunk/zoo-project/zoo-kernel/zoo_service_loader.c

@@ -3418 +3418 @@
   signal (SIGABRT, donothing);
 #endif
-    fprintf(stderr,"%s %d \n",__FILE__,__LINE__);
-    fflush(stderr);
 
   if (((int) zGetpid ()) != cpid || cgiSid != NULL)
     {
-    fprintf(stderr,"%s %d \n",__FILE__,__LINE__);
-    fflush(stderr);
       if (eres == SERVICE_SUCCEEDED)
 #ifdef USE_CALLBACK

trunk/zoo-project/zoo-services/cgal/voronoi.c

@@ -46 +46 @@
 
   int Voronoi(maps*& conf,maps*& inputs,maps*& outputs){
-    //#ifdef DEBUG
+#ifdef DEBUG
     fprintf(stderr,"\nService internal print\nStarting\n");
-    //#endif
+#endif
     //return SERVICE_FAILED;
     maps* cursor=inputs;
@@ -56 +56 @@
     tmpm=getMapFromMaps(inputs,"InputPoints","value");
 
+#ifdef DEBUG
     fprintf(stderr," **** %s %d\n",__FILE__,__LINE__);
     fflush(stderr);
+#endif
 
     OGRRegisterAll();
@@ -67 +69 @@
       return SERVICE_FAILED;
     }
+#ifdef DEBUG
     fprintf(stderr," **** %s %d\n",__FILE__,__LINE__);
     fflush(stderr);
+#endif
     
     Triangulation T;
@@ -204 +208 @@
         const Pointz p1=tmp->source();
         const Pointz p2=tmp->target();
-        fprintf(stderr,"P1 %d %d | P2 %d %d\n",p1.x(),p1.y(),p2.x(),p2.y());
 #ifdef DEBUG
         fprintf(stderr,"P1 %d %d | P2 %d %d\n",p1.x(),p1.y(),p2.x(),p2.y());