Skip to content

Commit

Permalink
GITC-6295 - WMS memory improvements
Browse files Browse the repository at this point in the history
Merge in GITC/onearth from GITC-6295 to develop

* commit '24013da751e94990437a9eef0939f26dfa161339':
  Re-tuned fcgid_module in oe2_wms.conf
  Bumped MapServer to 8.2.2 in test dockerfile
  Bumped MapServer to 8.2.2
  • Loading branch information
Matthew Graber committed Sep 27, 2024
2 parents 5601405 + 24013da commit c547ab2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
8 changes: 4 additions & 4 deletions docker/test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ RUN make && make install

# Mapserver
WORKDIR /tmp
RUN wget http://download.osgeo.org/mapserver/mapserver-8.0.1.tar.gz && \
tar xf mapserver-8.0.1.tar.gz
WORKDIR /tmp/mapserver-8.0.1
RUN wget http://download.osgeo.org/mapserver/mapserver-8.2.2.tar.gz && \
tar xf mapserver-8.2.2.tar.gz
WORKDIR /tmp/mapserver-8.2.2
RUN mkdir build
WORKDIR /tmp/mapserver-8.0.1/build
WORKDIR /tmp/mapserver-8.2.2/build
RUN cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DWITH_POSTGIS=0 -DWITH_GIF=0 -DWITH_KML=1 -DWITH_PROTOBUFC=0 ../
RUN make && make install
RUN echo '/usr/local/lib' > /etc/ld.so.conf.d/mapserver.conf
Expand Down
8 changes: 4 additions & 4 deletions docker/wms_service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ RUN make && make install

# Mapserver
WORKDIR /tmp
RUN wget http://download.osgeo.org/mapserver/mapserver-8.0.1.tar.gz
RUN tar xf mapserver-8.0.1.tar.gz
WORKDIR /tmp/mapserver-8.0.1
RUN wget http://download.osgeo.org/mapserver/mapserver-8.2.2.tar.gz
RUN tar xf mapserver-8.2.2.tar.gz
WORKDIR /tmp/mapserver-8.2.2
RUN mkdir build
WORKDIR /tmp/mapserver-8.0.1/build
WORKDIR /tmp/mapserver-8.2.2/build
RUN cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DWITH_POSTGIS=0 -DWITH_GIF=0 -DWITH_KML=1 -DWITH_PROTOBUFC=0 ../
RUN make && make install
RUN echo '/usr/local/lib' > /etc/ld.so.conf.d/mapserver.conf
Expand Down
3 changes: 2 additions & 1 deletion docker/wms_service/oe2_wms.conf
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,6 @@ AddHandler fcgid-script fcgi

<IfModule fcgid_module>
FcgidIOTimeout 300
FcgidMaxProcessesPerClass 100
FcgidMaxProcessesPerClass 200
FcgidMaxRequestsPerProcess 25
</IfModule>

0 comments on commit c547ab2

Please sign in to comment.