Changeset 982


Ignore:
Timestamp:
Feb 24, 2021, 6:20:56 PM (8 months ago)
Author:
djay
Message:

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

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Dockerfile

    r969 r982  
    1818    libxslt1.1 \
    1919    gdal-bin \
     20    libcgal13 \
    2021    python3 \
    2122    r-base \
     
    108109    libxml2-dev \
    109110    libxslt1-dev \
     111    libcgal-dev \
    110112"
    111113WORKDIR /zoo-project
    112 COPY ./zoo-project/zoo-services/utils/status ./zoo-project/zoo-services/utils/status
     114COPY ./zoo-project/zoo-services ./zoo-project/zoo-services
    113115
    114116# From zoo-kernel
     
    133135    && make install \
    134136    \
     137    && cd ../../cgal \
     138    && make \
     139    && cp cgi-env/* /usr/lib/cgi-bin/ \
     140    \
     141    && cd .. \
     142    && cd ../zoo-services/ogr/base-vect-ops \
     143    && make \
     144    && cp cgi-env/* /usr/lib/cgi-bin/ \
     145    && cd ../.. \
     146    \
     147    && cd ../zoo-services/gdal/ \
     148    && for i in contour dem grid profile translate warp ; do cd $i ; make && cp cgi-env/* /usr/lib/cgi-bin/ ; cd .. ; done \
     149    \
    135150    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $BUILD_DEPS \
    136151    && rm -rf /var/lib/apt/lists/*
     152
     153#
     154# Optional zoo demos download.
     155#
     156FROM base AS demos
     157ARG DEBIAN_FRONTEND=noninteractive
     158ARG BUILD_DEPS=" \
     159    git \
     160"
     161WORKDIR /zoo-project
     162
     163RUN set -ex \
     164    && apt-get update && apt-get install -y --no-install-recommends $BUILD_DEPS \
     165    \
     166    && git clone https://github.com/ZOO-Project/examples.git
    137167
    138168#
     
    157187COPY --from=builder2 /usr/com/zoo-project/ /usr/com/zoo-project/
    158188
     189# From optional zoo demos
     190COPY --from=demos /zoo-project/examples/data/ /usr/com/zoo-project/
     191COPY --from=demos /zoo-project/examples/ /var/www/html/
     192
     193
    159194RUN set -ex \
    160195    && apt-get update && apt-get install -y --no-install-recommends $RUN_DEPS \
  • trunk/docker-compose.yml

    r968 r982  
    1414      - ./zoo-project/zoo-services/utils/open-api/templates/index.html:/var/www/index.html
    1515      - ./zoo-project/zoo-services/utils/open-api/static:/var/www/html/static
     16      - ../zoo-demos/zoo-demos-202102/examples:/var/www/html/examples
     17      - ../zoo-demos/zoo-demos-202102/data/topofr.tif:/usr/com/zoo-project/topofr.tif
    1618    depends_on:
    1719      - pgbouncer
  • trunk/zoo-project/HISTORY.txt

    r980 r982  
     1Version 1.8.1
     2  * Deploy demo HTML UI from github from the Dockerfile
     3  * Add demo ZOO-Services build in the Dockerfile
    14Version 1.8.0
    25  * Support raw response in OGC API - Processes
  • trunk/zoo-project/zoo-kernel/Makefile.in

    r980 r982  
    44
    55version.h: Makefile
    6         echo "#define ZOO_VERSION \"1.8.0 `svnversion`\"" > version.h
     6        echo "#define ZOO_VERSION \"1.8.1-dev `svnversion`\"" > version.h
    77        echo "@ETC_DEF@" >> version.h
    88        echo "#define LOCALEDIR \"@localedir@\"" >>  version.h
  • trunk/zoo-project/zoo-kernel/configure.ac

    r980 r982  
    1 AC_INIT([ZOO Kernel], [1.8.0], [bugs@zoo-project.org])
     1AC_INIT([ZOO Kernel], [1.8.1-dev], [bugs@zoo-project.org])
    22
    33AC_CONFIG_MACRO_DIR([macros])
  • trunk/zoo-project/zoo-kernel/server_internal.c

    r967 r982  
    375375  zStatStruct f_status;
    376376  int s=zStat(filename, &f_status);
    377   sprintf(rsize,"%lld",f_status.st_size);
     377  sprintf(rsize,"%ld",f_status.st_size);
    378378  if(getMap(content,"storage")==NULL){
    379379    map* tmpMap1=getMap(content,"value");
  • trunk/zoo-project/zoo-kernel/zoo_service_loader.c

    r974 r982  
    34183418  signal (SIGABRT, donothing);
    34193419#endif
    3420     fprintf(stderr,"%s %d \n",__FILE__,__LINE__);
    3421     fflush(stderr);
    34223420
    34233421  if (((int) zGetpid ()) != cpid || cgiSid != NULL)
    34243422    {
    3425     fprintf(stderr,"%s %d \n",__FILE__,__LINE__);
    3426     fflush(stderr);
    34273423      if (eres == SERVICE_SUCCEEDED)
    34283424#ifdef USE_CALLBACK
  • trunk/zoo-project/zoo-services/cgal/voronoi.c

    r980 r982  
    4646
    4747  int Voronoi(maps*& conf,maps*& inputs,maps*& outputs){
    48     //#ifdef DEBUG
     48#ifdef DEBUG
    4949    fprintf(stderr,"\nService internal print\nStarting\n");
    50     //#endif
     50#endif
    5151    //return SERVICE_FAILED;
    5252    maps* cursor=inputs;
     
    5656    tmpm=getMapFromMaps(inputs,"InputPoints","value");
    5757
     58#ifdef DEBUG
    5859    fprintf(stderr," **** %s %d\n",__FILE__,__LINE__);
    5960    fflush(stderr);
     61#endif
    6062
    6163    OGRRegisterAll();
     
    6769      return SERVICE_FAILED;
    6870    }
     71#ifdef DEBUG
    6972    fprintf(stderr," **** %s %d\n",__FILE__,__LINE__);
    7073    fflush(stderr);
     74#endif
    7175   
    7276    Triangulation T;
     
    204208        const Pointz p1=tmp->source();
    205209        const Pointz p2=tmp->target();
    206         fprintf(stderr,"P1 %d %d | P2 %d %d\n",p1.x(),p1.y(),p2.x(),p2.y());
    207210#ifdef DEBUG
    208211        fprintf(stderr,"P1 %d %d | P2 %d %d\n",p1.x(),p1.y(),p2.x(),p2.y());
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png