steve
/
geoserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37 from ahennr/tomcat-update 

Update tomcat version to v9.0.83 - Fix for CVE-2023-46589
pull/40/head
Nils Bühner 2023-12-11 13:36:26 +01:00 committed by GitHub
parent 7c087d2f46 7bd08f9734
commit 493e819734
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,6 +1,6 @@
FROM ubuntu:22.04 as tomcat FROM ubuntu:22.04 as tomcat
ARG TOMCAT_VERSION=9.0.82 ARG TOMCAT_VERSION=9.0.83
ARG CORS_ENABLED=false ARG CORS_ENABLED=false
ARG CORS_ALLOWED_ORIGINS=* ARG CORS_ALLOWED_ORIGINS=*
ARG CORS_ALLOWED_METHODS=GET,POST,PUT,DELETE,HEAD,OPTIONS ARG CORS_ALLOWED_METHODS=GET,POST,PUT,DELETE,HEAD,OPTIONS
@ -52,7 +52,7 @@ RUN apt purge -y \
FROM tomcat as download FROM tomcat as download
ARG GS_VERSION=2.24.0 ARG GS_VERSION=2.24.1
ARG GS_BUILD=release ARG GS_BUILD=release
ARG WAR_ZIP_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip ARG WAR_ZIP_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip
ENV GEOSERVER_VERSION=$GS_VERSION ENV GEOSERVER_VERSION=$GS_VERSION
@ -68,7 +68,7 @@ RUN echo "Downloading GeoServer ${GS_VERSION} ${GS_BUILD}" \
FROM tomcat as install FROM tomcat as install
ARG GS_VERSION=2.24.0 ARG GS_VERSION=2.24.1
ARG GS_BUILD=release ARG GS_BUILD=release
ARG STABLE_PLUGIN_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/extensions ARG STABLE_PLUGIN_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/extensions
ARG COMMUNITY_PLUGIN_URL='' ARG COMMUNITY_PLUGIN_URL=''

4
docker-compose-demo.yml
View File

@ -4,7 +4,7 @@ services:
build: build:
context: . context: .
args: args:
- GEOSERVER_VERSION=2.24.0 - GEOSERVER_VERSION=2.24.1
- CORS_ENABLED=true - CORS_ENABLED=true
- CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS - CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS
ports: ports:
@ -26,7 +26,7 @@ services:
postgis: postgis:
image: postgis/postgis:16-3.4-alpine image: postgis/postgis:16-3.4-alpine
ports: ports:
- 5555:5432 - "5555:5432"
environment: environment:
POSTGRES_USER: geoserver POSTGRES_USER: geoserver
POSTGRES_PASSWORD: geoserver POSTGRES_PASSWORD: geoserver