Commit ee700a74 authored by Ignacio's avatar Ignacio
Browse files

Deja geoserver 2.14.3 y corrige rutas jre

parent e17770f8

Dockerfile

+6 −8
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ ENV MARLIN_VERSION="0.9.3" \ 
	IMAGE_IO_VERSION="1_1" \

	GDAL_VERSION="2.2.3" \

	TURBO_JPEG_VERSION="1.5.3" \

	GEOSERVER_MAJOR_VERSION="2.15" \

	GEOSERVER_MINOR_VERSION="0" \

	GEOSERVER_MAJOR_VERSION="2.14" \

	GEOSERVER_MINOR_VERSION="3" \

	CATALINA_HOME="/usr/local/tomcat"



ENV GEOSERVER_HOME="${CATALINA_HOME}/webapps/geoserver"
@@ -81,7 +81,6 @@ ENV GEOSERVER_PLUGINS="css inspire libjpeg-turbo csw wps pyramid vectortiles net 
	NOTO_FONTS="NotoSans-unhinted NotoSerif-unhinted NotoMono-hinted" \

	GDAL_DATA="/usr/share/gdal/2.2" \

	TEMP_PATH="/tmp/resources" \

	JRE_HOME="" \

	PATH="${CATALINA_HOME}/bin:${PATH}"



COPY ./scripts /
@@ -185,9 +184,8 @@ RUN mkdir -p "${TEMP_PATH}" "${GEOSERVER_DATA_DIR}" "${GEOSERVER_LOG_DIR}" "${CA 
		cat "${TEMP_PATH}/${JAI_FILENAME}" && \

		exit 1; \

	fi; \

	mkdir -p ${JAVA_HOME}/lib/ext/ && \

	mv ${TEMP_PATH}/jai-${JAI_VERSION}/lib/*.jar ${JAVA_HOME}/lib/ext/ && \

	mv ${TEMP_PATH}/jai-${JAI_VERSION}/lib/*.so ${JAVA_HOME}/lib/amd64/ && \

	mv ${TEMP_PATH}/jai-${JAI_VERSION}/lib/*.jar ${JRE_HOME}/lib/ext/ && \

	mv ${TEMP_PATH}/jai-${JAI_VERSION}/lib/*.so ${JRE_HOME}/lib/amd64/ && \

	#

	# Install Image IO

	#
@@ -200,8 +198,8 @@ RUN mkdir -p "${TEMP_PATH}" "${GEOSERVER_DATA_DIR}" "${GEOSERVER_LOG_DIR}" "${CA 
		cat "${TEMP_PATH}/${IMAGE_IO_FILENAME}" && \

		exit 1; \

	fi; \

	mv ${TEMP_PATH}/jai_imageio-${IMAGE_IO_VERSION}/lib/*.jar ${JAVA_HOME}/lib/ext/ && \

	mv ${TEMP_PATH}/jai_imageio-${IMAGE_IO_VERSION}/lib/*.so ${JAVA_HOME}/lib/amd64/ && \

	mv ${TEMP_PATH}/jai_imageio-${IMAGE_IO_VERSION}/lib/*.jar ${JRE_HOME}/lib/ext/ && \

	mv ${TEMP_PATH}/jai_imageio-${IMAGE_IO_VERSION}/lib/*.so ${JRE_HOME}/lib/amd64/ && \

	#

	# Install GeoServer Plugins

	#