Skip to content

Commit 69561b1

Browse files
committed
Upgrade to GeoServer 2.24.2
1 parent 05cf135 commit 69561b1

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

docker/geoserver/Dockerfile

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARG GEOSERVER_CORS_ALLOWED_HEADERS=*
1010
#
1111
# Set GeoServer version and data directory
1212
#
13-
ENV GEOSERVER_VERSION=2.23.3
13+
ENV GEOSERVER_VERSION=2.24.2
1414
ENV GEOSERVER_DATA_DIR="/geoserver_data/data"
1515
ENV GEOSERVER_CORS_ENABLED=$GEOSERVER_CORS_ENABLED
1616
ENV GEOSERVER_CORS_ALLOWED_ORIGINS=$GEOSERVER_CORS_ALLOWED_ORIGINS
@@ -28,15 +28,13 @@ RUN cd /usr/local/tomcat/webapps \
2828

2929
VOLUME $GEOSERVER_DATA_DIR
3030

31-
# added by simonelanucara https://github.com/simonelanucara
32-
# Optionally add JAI, ImageIO and Marlin Render for improved Geoserver performance
33-
WORKDIR /tmp
34-
35-
RUN wget --no-check-certificate https://repo1.maven.org/maven2/org/postgis/postgis-jdbc/1.3.3/postgis-jdbc-1.3.3.jar -O postgis-jdbc-1.3.3.jar && \
36-
wget --no-check-certificate https://maven.geo-solutions.it/org/hibernatespatial/hibernate-spatial-postgis/1.1.3.2/hibernate-spatial-postgis-1.1.3.2.jar -O hibernate-spatial-postgis-1.1.3.2.jar && \
37-
rm /usr/local/tomcat/webapps/geoserver/WEB-INF/lib/hibernate-spatial-h2-geodb-1.1.3.2.jar && \
38-
mv hibernate-spatial-postgis-1.1.3.2.jar /usr/local/tomcat/webapps/geoserver/WEB-INF/lib/ && \
39-
mv postgis-jdbc-1.3.3.jar /usr/local/tomcat/webapps/geoserver/WEB-INF/lib/
31+
# no longer used since 2.24.2
32+
#ENV GEOSERVER_LIB_DIR="/usr/local/tomcat/webapps/geoserver/WEB-INF/lib"
33+
#RUN wget --no-check-certificate https://repo1.maven.org/maven2/org/postgis/postgis-jdbc/1.3.3/postgis-jdbc-1.3.3.jar -O postgis-jdbc-1.3.3.jar && \
34+
# wget --no-check-certificate https://maven.geo-solutions.it/org/hibernatespatial/hibernate-spatial-postgis/1.1.3.2/hibernate-spatial-postgis-1.1.3.2.jar -O hibernate-spatial-postgis-1.1.3.2.jar && \
35+
# rm $GEOSERVER_LIB_DIR/hibernate-spatial-h2-geodb-1.1.3.2.jar && \
36+
# mv hibernate-spatial-postgis-1.1.3.2.jar $GEOSERVER_LIB_DIR && \
37+
# mv postgis-jdbc-1.3.3.jar $GEOSERVER_LIB_DIR
4038

4139

4240
# copy the script and perform the run of scripts from entrypoint.sh

docker/geoserver/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
restart: on-failure
1616

1717
geoserver:
18-
image: geonode/geoserver:2.23.3
18+
image: geonode/geoserver:2.24.2
1919
build:
2020
context: .
2121
links:
@@ -39,7 +39,7 @@ services:
3939
restart: on-failure
4040

4141
data-dir-conf:
42-
image: geonode/geoserver_data:2.23.3
42+
image: geonode/geoserver_data:2.24.2
4343
container_name: geoserver_data_dir # named data container
4444
entrypoint: sleep infinity
4545
volumes:

docker/geoserver_data/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN mkdir -p /tmp/geonode/downloaded
99
ENV TEMP_DOWNLOADED /tmp/geonode/downloaded
1010
WORKDIR ${TEMP_DOWNLOADED}
1111

12-
ENV GEOSERVER_VERSION=2.23.3
12+
ENV GEOSERVER_VERSION=2.24.2
1313

1414
ADD download.sh ${TEMP_DOWNLOADED}
1515
RUN chmod +x ${TEMP_DOWNLOADED}/download.sh

docker/geoserver_data/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '2'
33
services:
44
data_dir_conf:
55
build: .
6-
image: geonode/geoserver_data:2.23.3
6+
image: geonode/geoserver_data:2.24.2
77
container_name: geoserver_data_dir
88
command: /bin/true
99
volumes:

0 commit comments

Comments
 (0)