Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#161 Use platform JDK package to leverage faster native JPEG encoding #162

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#161 Use platform JDK package to leverage faster native JPEG encoding #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ COPY run_tests.sh /docker/tests/run_tests.sh
# install needed packages and create externalized dirs
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get install --yes git vim gdal-bin postgresql-client fontconfig libfreetype6 jq unzip \
&& apt-get install --yes git vim gdal-bin postgresql-client fontconfig libfreetype6 jq unzip openjdk-11-jdk-headless \
&& apt-get clean \
&& apt-get -y autoclean \
&& apt-get -y autoremove \
Expand All @@ -127,6 +127,9 @@ RUN apt-get update \
"${NETCDF_DATA_DIR}" \
"${GRIB_CACHE_DIR}"

# Remove the Tomcat docker installed Java, we're not going to use it
RUN rm -rf /opt/java

# copy from mother
COPY --from=mother "/output/datadir" "${GEOSERVER_DATA_DIR}"
COPY --from=mother "/output/webapp/geoserver" "${CATALINA_BASE}/webapps/geoserver"
Expand Down
4 changes: 4 additions & 0 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ fi
# Disable tomcat version disclosure
sed -i '/<\/Host>/i\ \ \ \ \ \ \ \ <Valve className="org.apache.catalina.valves.ErrorReportValve" showReport="false" showServerInfo="false"/>' "$CATALINA_HOME/conf/server.xml";

# Enforce usage of distribution own Java
export PATH="/usr/lib/jvm/java-11-openjdk-amd64/bin:$PATH"
export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"

catalina.sh run &
/usr/local/bin/geoserver-rest-config.sh
fg %1