Commit Graph

151 Commits (56b2c66da8057751bdc2feee5e169bb1e71e33b4)

Author SHA1 Message Date
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 7d3e39ae91 Update README environment variables 2024-07-08 21:04:19 -04:00
Dirk Mennecke b591a1a4c5 Update readme 2024-07-08 21:04:19 -04:00
Dirk Mennecke 33a221ac41 Add update_credentials script 2024-07-08 21:04:19 -04:00
Dirk Mennecke e4263e6d1c Edit startup.sh to handle credentials update 2024-07-08 21:04: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
Nils Bühner 97749438f8 feat: ignore pg data when using compose example 2024-07-08 21:02:58 -04:00
Andreas Schmitz f41ecf84fc fix: allow unicode filenames 2024-07-08 21:02:58 -04:00
Chris Barnett 2d277578a6
Merge branch 'geoserver:master' into support-tomcat-root 2024-05-14 15:29:55 -04:00
Nils Bühner 0d4736fc3a
Merge pull request #54 from IceflowRE/master
Fix env var default values in Readme
2024-05-03 09:04:27 +02:00
Iceflower 795acadadc
Fix env var default values 2024-04-25 16:03:02 +02:00
Nils Bühner a08b70dd91
Merge pull request #53 from petersmythe/patch-1
Update README.md
2024-04-24 18:20:02 +02:00
Peter Smythe e2ac59468f
Update README.md
Easily find latest version numbers
2024-04-24 16:18:03 +02:00
Chris Barnett a7a2e52f1c
Merge branch 'geoserver:master' into support-tomcat-root 2024-03-05 14:50:22 -05:00
Jody Garnett fd39d4fabf
Update release.sh to indicate main is 2.26 branch 2024-03-04 22:18:25 -08: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
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
Nils Bühner 7db7ead9ad
Merge pull request #50 from mprins/patch-1
Update TOMCAT_VERSION to 9.0.86
2024-02-20 11:29:23 +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
Nils Bühner afb06f07d7
Merge pull request #44 from jkroepke/patch-1
Support custom web.xml
2024-02-14 10:59:00 +01:00
Chris Barnett a2643b4d00 manually deploy ROOT context when ROOT_WEBAPP_REDIRECT is true and WEBAPP_CONTEXT is not '' 2024-02-13 15:13:40 -05: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
Jan-Otto Kröpke 16fe5727d1
Update README.md 2024-02-10 01:04:48 +01:00
Jan-Otto Kröpke 1d4bc77faf
Merge branch 'master' into patch-1 2024-02-09 09:35:51 +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
Chris Barnett b87f625c1e
Merge branch 'geoserver:master' into support-tomcat-root 2024-02-08 17:16:19 -05:00
Nils Bühner 2490a96a8c docs: update readme regarding config overwrite 2024-02-07 15:04:19 +01:00
Nils Bühner 09f1dfec0c refactor: use function to avoid duplicate code 2024-02-07 14:49:03 +01:00
Nils Bühner 4a68744113 feat: allow use of custom server.xml 2024-02-07 14:29:46 +01:00
Nils Bühner e1677a9e75
Merge pull request #46 from ahennr/trivy-format
fix: use sarif format in trivy results
2024-02-07 14:24:09 +01:00
Andre Henn 9aaf0e6aa4
fix: use sarif format in trivy results 2024-02-07 13:52:29 +01:00
Andre Henn 9ff2eb405e
adds documentation for usage of custom server.xml 2024-02-07 12:59:21 +01:00
Andre Henn 733dde3e77
fix: set user id of geoserver user to 2000 2024-02-07 12:44:37 +01:00
Jan-Otto Kröpke 906cab1267
Update README.md 2024-01-29 23:20:17 +01:00
Jan-Otto Kröpke d744517e76
Update startup.sh 2024-01-29 11:14:05 +01:00
Jan-Otto Kröpke c691b3578b
Update startup.sh
Co-authored-by: Reinout van Rees <reinout@vanrees.org>
2024-01-29 11:12:25 +01:00
Jan-Otto Kröpke e725d75cd9
Support custom web.xml 2024-01-29 09:50:18 +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 0966018436
Merge pull request #43 from ahennr/trivy-results
Configure trivy action to upload results to security tab
2024-01-02 10:16:40 +01:00
Andre Henn 8eb35730e3
configure trivy action to upload results to security tab 2023-12-20 16:39:52 +01:00
Nils Bühner 4343dca5d3
Merge pull request #42 from buehner/no-fail-with-vulns
chore: do not fail with known vulns
2023-12-20 14:25:00 +01:00