Major improvements (data-dir, python, locations)#85
Open
etj wants to merge 5 commits into
Open
Conversation
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 12 out of 15 changed files in this pull request and generated 2 comments.
Comments suppressed due to low confidence (3)
docker/geoserver/scripts/entrypoint.sh:33
- This glob moves both "$TMP_EXTRACT/data/" and "$TMP_EXTRACT/data/.". In bash, the second glob expands to "." and ".." as well, which can cause errors and can attempt to move the parent directory into GEOSERVER_DATA_DIR. This can lead to incomplete/failed datadir initialization on first boot.
docker/geoserver/scripts/entrypoint.sh:21 - GEOSERVER_DATA_DIR is expanded unquoted. While unlikely, an unexpected value (whitespace, glob chars) could cause mkdir to create the wrong path(s). Quoting is safer and consistent with the rest of the script.
docker/geoserver/scripts/set_geoserver_auth.sh:48 - The escape_regex() implementation uses a character class containing "@/-" which is interpreted as a range in many regex engines, making the escaping behavior broader than intended (and potentially incorrect) if this helper is used. If you keep the function, fix the character class so '-' is treated literally.
| VOLUME $GEOSERVER_DATA_DIR | ||
|
|
||
| ENV JAVA_OPTS="-Djava.awt.headless=true -Dgwc.context.suffix=gwc -XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=/var/log/jvm.log -XX:MaxPermSize=512m -XX:PermSize=256m -Xms512m -Xmx2048m -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=4 -Dfile.encoding=UTF8 -Djavax.servlet.request.encoding=UTF-8 -Djavax.servlet.response.encoding=UTF-8 -Duser.timezone=GMT -Dorg.geotools.shapefile.datetime=false -DGS-SHAPEFILE-CHARSET=UTF-8 -DGEOSERVER_CSRF_DISABLED=true -DPRINT_BASE_URL=http://geoserver:8080/geoserver/pdf -Xbootclasspath/a:/usr/local/tomcat/webapps/geoserver/WEB-INF/lib/marlin-0.9.3.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine" | ||
| ENV JAVA_OPTS="-Djava.awt.headless=true -Dgwc.context.suffix=gwc -XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=/var/log/jvm.log -XX:MaxPermSize=512m -XX:PermSize=256m -Xms2048m -Xmx2048m -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=4 -Dfile.encoding=UTF8 -Djavax.servlet.request.encoding=UTF-8 -Djavax.servlet.response.encoding=UTF-8 -Duser.timezone=GMT -Dorg.geotools.shapefile.datetime=false -DGS-SHAPEFILE-CHARSET=UTF-8 -DGEOSERVER_CSRF_DISABLED=true -DPRINT_BASE_URL=http://geoserver:8080/geoserver/pdf -Xbootclasspath/a:/usr/local/tomcat/webapps/geoserver/WEB-INF/lib/marlin-0.9.3.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine" |
| @@ -1,8 +1,8 @@ | |||
| ARG IMAGE_VERSION=9.0.106-jdk11-temurin-jammy | |||
| ARG IMAGE_VERSION=9.0.118-jdk17-temurin-jammy | |||
| ARG JAVA_HOME=/usr/local/openjdk-11 | |||
Contributor
Author
|
Cleaning up JAVA_OPTS: Old: New:
Let's make sure these changes are also reported in the sample env files in GeoNode and projects |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Needs changes in docker compose in geonode and geonode-project, so let's release it as a different tag