From de80bfbf23cfe6b5a697be26a98b2cd2008c5ab9 Mon Sep 17 00:00:00 2001 From: Pierre Mauduit Date: Wed, 24 Apr 2024 10:11:28 +0200 Subject: [PATCH 1/2] docker/jetty - removes javax.mail library provided by the docker image (georchestra/georchestra#4233) See https://github.com/georchestra/georchestra/issues/4233 for the context ; applying the same fix as the one on the console docker image. --- web/src/docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/src/docker/Dockerfile b/web/src/docker/Dockerfile index 4c4c5392de..f041983d2d 100644 --- a/web/src/docker/Dockerfile +++ b/web/src/docker/Dockerfile @@ -14,6 +14,9 @@ RUN chown jetty:jetty /docker-entrypoint.d RUN mkdir -p /mnt/geonetwork_datadir && \ chown jetty:jetty /mnt/geonetwork_datadir +# Removes extra javax.mail library provided by Jetty +RUN rm -rf /usr/local/jetty/lib/mail + # Restore jetty user USER jetty From 0050ee2fada1db70a85adeeb73e506b318ad51ed Mon Sep 17 00:00:00 2001 From: Pierre Mauduit Date: Wed, 24 Apr 2024 10:30:47 +0200 Subject: [PATCH 2/2] pr template - updating link unrelated to current PR but attempt to fix url. --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 099003f541..787605aca7 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -4,5 +4,5 @@ - [ ] PR only involves cherry-picked commits from upstream. - [ ] PR contains custom code which will soon be available in an upstream release and can be overriden => mention core-geonetwork version if possible. - [ ] PR contains custom geOrchestra code, which need to be verified during future migrations. - - [ ] I have properly filled the [migration-helper-changelog.md](..%2Fgeorchestra-migration%2Fmigration-helper-changelog.md) file. + - [ ] I have properly filled the [migration-helper-changelog.md](../georchestra-migration/migration-helper-changelog.md) file.