Skip to content

Commit

Permalink
fix: update tomcat base image (#671)
Browse files Browse the repository at this point in the history
* fix: update tomcat base image
  • Loading branch information
robertd authored Jul 14, 2024
1 parent 345648e commit 1e0eed8
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ COMPOSE_PROJECT_NAME=kartozageoserver
# ###############
# Build Arguments
# ###############
IMAGE_VERSION=9.0.89-jdk11-temurin-focal
IMAGE_VERSION=9.0.91-jdk11-temurin-focal
GS_VERSION=2.25.2
JAVA_HOME=/opt/java/openjdk
WAR_URL=http://downloads.sourceforge.net/project/geoserver/GeoServer/2.25.0/geoserver-2.25.0-war.zip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
geoserverMajorVersion:
- 2
imageVersion:
- image: 9.0.89-jdk11-temurin-focal
- image: 9.0.91-jdk11-temurin-focal
javaHome: /opt/java/openjdk
geoserverMinorVersion:
- minor: 25
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
geoserverMajorVersion:
- 2
imageVersion:
- image: 9.0.89-jdk11-temurin-focal
- image: 9.0.91-jdk11-temurin-focal
javaHome: /opt/java/openjdk
geoserverMinorVersion:
- minor: 25
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#--------- Generic stuff all our Dockerfiles should start with so we get caching ------------
ARG IMAGE_VERSION=9.0.89-jdk11-temurin-focal
ARG IMAGE_VERSION=9.0.91-jdk11-temurin-focal
ARG JAVA_HOME=/opt/java/openjdk

##############################################################################
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,19 @@ for available tags.

```
VERSION=2.25.2
IMAGE_VERSION=9.0.89-jdk11-temurin-focal
IMAGE_VERSION=9.0.91-jdk11-temurin-focal
docker build --build-arg IMAGE_VERSION=${IMAGE_VERSION} --build-arg GS_VERSION=${VERSION} -t kartoza/geoserver:${VERSION} .
```
For some recent builds, it is necessary to set the JAVA_PATH as well (e.g. Apache Tomcat/9.0.36)
```
docker build --build-arg IMAGE_VERSION=9.0.89-jdk11-temurin-focal --build-arg JAVA_HOME=/usr/local/openjdk-11/bin/java --build-arg GS_VERSION=2.25.2 -t kartoza/geoserver:2.25.2 .
docker build --build-arg IMAGE_VERSION=9.0.91-jdk11-temurin-focal --build-arg JAVA_HOME=/usr/local/openjdk-11/bin/java --build-arg GS_VERSION=2.25.2 -t kartoza/geoserver:2.25.2 .
```
**Note:** Please check the [GeoServer documentation](https://docs.geoserver.org/stable/en/user/production/index.html)
to see which Tomcat versions are supported.
The current build uses the base image `tomcat:9.0.89-jdk11-temurin-focal` because of the dependency on
The current build uses the base image `tomcat:9.0.91-jdk11-temurin-focal` because of the dependency on
`libgdal-java`. The tomcat base images > focal will not
have the java bindings for the [GDAL plugin](https://osgeo-org.atlassian.net/browse/GEOT-7412?focusedCommentId=84733)
hence the container will not support the gdal plugin working is you build using base image > focal.
Expand Down

0 comments on commit 1e0eed8

Please sign in to comment.