Merge pull request #37 from ahennr/tomcat-update
Update tomcat version to v9.0.83 - Fix for CVE-2023-46589pull/40/head
commit
493e819734
|
|
@ -1,6 +1,6 @@
|
|||
FROM ubuntu:22.04 as tomcat
|
||||
|
||||
ARG TOMCAT_VERSION=9.0.82
|
||||
ARG TOMCAT_VERSION=9.0.83
|
||||
ARG CORS_ENABLED=false
|
||||
ARG CORS_ALLOWED_ORIGINS=*
|
||||
ARG CORS_ALLOWED_METHODS=GET,POST,PUT,DELETE,HEAD,OPTIONS
|
||||
|
|
@ -52,7 +52,7 @@ RUN apt purge -y \
|
|||
|
||||
FROM tomcat as download
|
||||
|
||||
ARG GS_VERSION=2.24.0
|
||||
ARG GS_VERSION=2.24.1
|
||||
ARG GS_BUILD=release
|
||||
ARG WAR_ZIP_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip
|
||||
ENV GEOSERVER_VERSION=$GS_VERSION
|
||||
|
|
@ -68,7 +68,7 @@ RUN echo "Downloading GeoServer ${GS_VERSION} ${GS_BUILD}" \
|
|||
|
||||
FROM tomcat as install
|
||||
|
||||
ARG GS_VERSION=2.24.0
|
||||
ARG GS_VERSION=2.24.1
|
||||
ARG GS_BUILD=release
|
||||
ARG STABLE_PLUGIN_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/extensions
|
||||
ARG COMMUNITY_PLUGIN_URL=''
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ services:
|
|||
build:
|
||||
context: .
|
||||
args:
|
||||
- GEOSERVER_VERSION=2.24.0
|
||||
- GEOSERVER_VERSION=2.24.1
|
||||
- CORS_ENABLED=true
|
||||
- CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS
|
||||
ports:
|
||||
|
|
@ -26,7 +26,7 @@ services:
|
|||
postgis:
|
||||
image: postgis/postgis:16-3.4-alpine
|
||||
ports:
|
||||
- 5555:5432
|
||||
- "5555:5432"
|
||||
environment:
|
||||
POSTGRES_USER: geoserver
|
||||
POSTGRES_PASSWORD: geoserver
|
||||
|
|
|
|||
Loading…
Reference in New Issue