From 56b2c66da8057751bdc2feee5e169bb1e71e33b4 Mon Sep 17 00:00:00 2001
From: Chris Barnett <Christopher.Barnett@tufts.edu>
Date: Mon, 8 Jul 2024 23:31:01 -0400
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit c94bd75cacbf4d8991da66a787151be9d353d9d9
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 6d965d2f6104f96fa36254a266cebc2769965a95
Author: Dirk Mennecke <dirk.mennecke@ipsyscon.de>
Date:   Thu Jun 6 12:55:08 2024 +0200

    Update README environment variables

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

    Update readme

commit 7ea027c7610f7492272c2203519c42b2f50b43e2
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 7be6e68b2eb06993b8e0c9b322953a523c589f9d
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 77945ab50ddb80cc85c7dec7850eb136dc74e7f1
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 ef8d2afa959de2be189b5d97017714410fd002b6
Author: Nils Bühner <buehner@terrestris.de>
Date:   Wed May 29 13:17:17 2024 +0200

    chore: use latest tomcat and geoserver versions

commit 6a203332f50d729c19b9c7a3f4048abb8ae3e1ca
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 37362a3c43fafd297e24f60030d994b14c39a292
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 d41f90b965eb4cdcc12f2deb05e7c82584a34aaf
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 119ec88b8fa1fdbf4bea0e0408f4574946b9506e
Author: Dirk Mennecke <dirk.mennecke@ipsyscon.de>
Date:   Fri May 24 15:10:05 2024 +0200

    Add update_credentials script

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

    Edit startup.sh to handle credentials update

commit 5857fa382b677297a4dbdba3ad9d6854aae5f882
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 a8029b3eba77a18449c39b73b8ce655f5ab41e41
Author: Andreas Schmitz <schmitz@terrestris.de>
Date:   Tue May 14 15:45:04 2024 +0200

    fix: allow unicode filenames

commit 41d2116ee2091e99bf95bf6c21cef416c10effcc
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.
---
 Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 7f046be..e961a0c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -107,6 +107,11 @@ ENV HTTPS_KEYSTORE_FILE=/opt/keystore.jks
 ENV HTTPS_KEYSTORE_PASSWORD=changeit
 ENV HTTPS_KEY_ALIAS=server
 
+ENV HTTPS_ENABLED=false
+ENV HTTPS_KEYSTORE_FILE=/opt/keystore.jks
+ENV HTTPS_KEYSTORE_PASSWORD=changeit
+ENV HTTPS_KEY_ALIAS=server
+
 EXPOSE 8080
 EXPOSE 8443