Commit Graph

83 Commits (177c52ee85ae0f3b9d424e91ea4c651c79596251)

Author SHA1 Message Date
Andre Henn 177c52ee85
chore: merge branch 'master' into tomcat-base-image 2024-07-22 09:22:03 +02:00
Nils Bühner f4d4c819fb
Merge pull request #47 from Tufts-Technology-Services/support-tomcat-root
Support tomcat root
2024-07-22 08:58:00 +02:00
Ali Raja 2f195e5dcd chore: use geoserver version 2.25.2 2024-07-19 13:13:01 +01:00
Andre Henn 97ea909607
use tomcat 9.0.91 2024-07-11 11:16:44 +02:00
Andre Henn 9abb0c62dd
update geoserver version 2024-07-11 11:16:12 +02:00
Chris Barnett a03ff2b0fe Merge remote-tracking branch 'origin/master' into support-tomcat-root 2024-07-08 23:37:04 -04:00
Chris Barnett 56b2c66da8 Squashed commit of the following:
commit c94bd75cac
Merge: 7ea027c 6d965d2
Author: Nils Bühner <buehner@terrestris.de>
Date:   Thu Jun 6 17:33:04 2024 +0200

    Merge pull request #60 from dmenneck/update-admin-credentials

    Update docs

commit 6d965d2f61
Author: Dirk Mennecke <dirk.mennecke@ipsyscon.de>
Date:   Thu Jun 6 12:55:08 2024 +0200

    Update README environment variables

commit c0d6edd74d
Author: Dirk Mennecke <dirk.mennecke@ipsyscon.de>
Date:   Thu Jun 6 09:41:36 2024 +0200

    Update readme

commit 7ea027c761
Merge: 7be6e68 119ec88
Author: Nils Bühner <buehner@terrestris.de>
Date:   Thu Jun 6 09:36:05 2024 +0200

    Merge pull request #57 from dmenneck/update-admin-credentials

    Set admin credentials with environment variables

commit 7be6e68b2e
Merge: 77945ab 41d2116
Author: Nils Bühner <buehner@terrestris.de>
Date:   Wed May 29 14:37:59 2024 +0200

    Merge pull request #34 from mbosecke/ssl

    Added basic HTTPS support

commit 77945ab50d
Merge: 6a20333 ef8d2af
Author: Nils Bühner <buehner@terrestris.de>
Date:   Wed May 29 13:18:06 2024 +0200

    Merge pull request #59 from buehner/gs-2.25.1-tomcat-9.0.89

    chore: use latest tomcat and geoserver versions

commit ef8d2afa95
Author: Nils Bühner <buehner@terrestris.de>
Date:   Wed May 29 13:17:17 2024 +0200

    chore: use latest tomcat and geoserver versions

commit 6a203332f5
Merge: d41f90b 37362a3
Author: Nils Bühner <buehner@terrestris.de>
Date:   Wed May 29 13:00:06 2024 +0200

    Merge pull request #58 from buehner/ignore-pg-data

    feat: ignore pg data when using compose example

commit 37362a3c43
Author: Nils Bühner <buehner@terrestris.de>
Date:   Wed May 29 12:54:11 2024 +0200

    feat: ignore pg data when using compose example

commit d41f90b965
Merge: 0d4736f a8029b3
Author: Nils Bühner <buehner@terrestris.de>
Date:   Wed May 29 12:39:55 2024 +0200

    Merge pull request #56 from hwbllmnn/allow-unicode-filenames

    fix: allow unicode filenames

commit 119ec88b8f
Author: Dirk Mennecke <dirk.mennecke@ipsyscon.de>
Date:   Fri May 24 15:10:05 2024 +0200

    Add update_credentials script

commit 96e081901b
Author: Dirk Mennecke <dirk.mennecke@ipsyscon.de>
Date:   Fri May 24 15:08:01 2024 +0200

    Edit startup.sh to handle credentials update

commit 5857fa382b
Author: Dirk Mennecke <dirk.mennecke@ipsyscon.de>
Date:   Fri May 24 15:06:12 2024 +0200

    Replace line breaks and run startup script with bash

commit a8029b3eba
Author: Andreas Schmitz <schmitz@terrestris.de>
Date:   Tue May 14 15:45:04 2024 +0200

    fix: allow unicode filenames

commit 41d2116ee2
Author: Mitchell Bösecke <mitchell.bosecke@forcorp.com>
Date:   Wed Nov 15 15:47:00 2023 -0700

    Added basic HTTPS support by mounting a JKS file and providing some environment variables.
2024-07-08 23:31:01 -04:00
Chris Barnett 91846716a3 fix merge errors
add config in server-https.xml
2024-07-08 21:20:52 -04:00
Chris Barnett 31aa91735c Added context element to config/server.xml and set autoDeploy and deployOnStartup to false
url in HEALTHCHECK written to file so that it can be set on startup
updated README with usage info
2024-07-08 21:08:33 -04:00
Chris Barnett fde66168af added env variable to specify which tomcat context GeoServer should be deployed at, including ROOT.
added logic to ignore ROOT_WEBAPP_REDIRECT if context is ROOT
added logic to choose the correct url for the healthcheck
2024-07-08 21:07:19 -04:00
Dirk Mennecke f6b80ad40d Replace line breaks and run startup script with bash 2024-07-08 21:04:19 -04:00
Mitchell Bösecke 701203821a Added basic HTTPS support by mounting a JKS file and providing some environment variables. 2024-07-08 21:02:58 -04:00
Nils Bühner cb4e2d2eb6 chore: use latest tomcat and geoserver versions 2024-07-08 21:02:58 -04:00
Andreas Schmitz f41ecf84fc fix: allow unicode filenames 2024-07-08 21:02:58 -04:00
André Henn 6cac7b0542
Merge branch 'tomcat-base-image' into merge-master 2024-06-27 14:51:30 +02:00
Andre Henn 8cd73ee873
Merge branch 'master' into tomcat-base-image 2024-06-27 14:46:44 +02:00
Nils Bühner 7ea027c761
Merge pull request #57 from dmenneck/update-admin-credentials
Set admin credentials with environment variables
2024-06-06 09:36:05 +02:00
Nils Bühner 7be6e68b2e
Merge pull request #34 from mbosecke/ssl
Added basic HTTPS support
2024-05-29 14:37:59 +02:00
Nils Bühner ef8d2afa95 chore: use latest tomcat and geoserver versions 2024-05-29 13:17:17 +02:00
Dirk Mennecke 5857fa382b Replace line breaks and run startup script with bash 2024-05-24 15:06:12 +02:00
Andreas Schmitz a8029b3eba fix: allow unicode filenames 2024-05-15 12:24:06 +02:00
André Henn a019d67687
Merge branch 'master' into tomcat-base-image 2024-05-07 08:57:40 +02:00
Chris Barnett a7a2e52f1c
Merge branch 'geoserver:master' into support-tomcat-root 2024-03-05 14:50:22 -05:00
Nils Bühner dbbbcea453
Merge pull request #52 from buehner/additional-lib-permissions
fix: do not run as custom user
2024-02-21 09:09:50 +01:00
Chris Barnett edd0315216
Merge branch 'geoserver:master' into support-tomcat-root 2024-02-20 15:22:53 -05:00
Nils Bühner ee3f7df6eb fix: do not run as custom user 2024-02-20 16:55:26 +01:00
Andre Henn 81ad21afb3
Merge branch 'master' into tomcat-base-image 2024-02-20 14:32:50 +01:00
André Henn bba764fe9a
Update Dockerfile
Co-authored-by: Mark Prins <1165786+mprins@users.noreply.github.com>
2024-02-20 14:23:45 +01:00
Nils Bühner 4eb3cdab3b
Merge pull request #51 from buehner/set-tomcat-version
fix: set tomcat version as environment variable
2024-02-20 14:15:43 +01:00
Nils Bühner a3f89c5797 fix: set tomcat version as environment variable 2024-02-20 14:13:30 +01:00
Mark Prins 5e9b7ea122
Update TOMCAT_VERSION to 9.0.86
see https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.86_(remm)
2024-02-20 11:19:43 +01:00
Chris Barnett ce561ff777 Added context element to config/server.xml and set autoDeploy and deployOnStartup to false
url in HEALTHCHECK written to file so that it can be set on startup
updated README with usage info
2024-02-13 13:50:05 -05:00
Chris Barnett edfcef33ad
Merge branch 'geoserver:master' into support-tomcat-root 2024-02-12 09:57:28 -05:00
Andre Henn 577a428c9c
perform cleanup before geoserver user is set as current user 2024-02-09 10:00:28 +01:00
Andre Henn 2de74a9bd1
use JDK rather than JRE 2024-02-09 09:59:56 +01:00
Andre Henn b374d93b20
switch to official tomcat 9 - jre 11 base image 2024-02-09 09:53:59 +01:00
Nils Bühner 3727938ec0
Merge pull request #39 from ahennr/tomcat-hardening-cis
Docker image and Tomcat configuration hardening
2024-02-09 09:21:48 +01:00
Nils Bühner 4a68744113 feat: allow use of custom server.xml 2024-02-07 14:29:46 +01:00
Andre Henn 733dde3e77
fix: set user id of geoserver user to 2000 2024-02-07 12:44:37 +01:00
Chris Barnett e04f1ed17d added env variable to specify which tomcat context GeoServer should be deployed at, including ROOT.
added logic to ignore ROOT_WEBAPP_REDIRECT if context is ROOT
added logic to choose the correct url for the healthcheck
2024-01-12 10:25:43 -05:00
Nils Bühner aa19de31d8 chore: use latest versions 2023-12-20 14:01:07 +01:00
Andre Henn 626b4775ba
Remove setuid and setgid permissions in the images to prevent privilege escalation attacks within containers 2023-12-12 14:42:59 +01:00
Andre Henn b108b4be06
introduce geoserver user as docker user 2023-12-12 14:31:00 +01:00
Andre Henn 4bc82ce2ba
Apply some CIS Apache Tomcat benchmark recommendations 2023-12-12 14:24:03 +01:00
Andre Henn 4d96f6f19c
introduce health checks for GeoServer and postgis 2023-12-11 14:20:01 +01:00
Andre Henn 7bd08f9734
use current geoserver stable release v2.24.1 2023-12-11 10:55:23 +01:00
Andre Henn 1b9b033dee
increase tomcat version to v9.0.83 2023-12-11 10:36:04 +01:00
Mitchell Bösecke 41d2116ee2 Added basic HTTPS support by mounting a JKS file and providing some environment variables. 2023-11-15 15:47:00 -07:00
Mitchell Bösecke d688d24e7a Added support for a PostgreSQL JNDI resource.
- Included a blurb on the README.md
- Provides a default "context.xml" that a user can easily configure using environment variables.
- Provides a mechanism for the user to override the default "context.xml" with their own version of the file for more advanced customization of the connection pool.

Heavily inspired by the work done at https://github.com/kartoza/docker-geoserver.
2023-11-09 08:59:33 -07:00
Nils Bühner 42e972b178 fix: Use consistent version number in Dockerfile 2023-11-09 10:24:22 +01:00