Commit beea1e6a authored by Ignacio's avatar Ignacio
Browse files

Actualiza geoserver a 2.15.0

Fue necesario cambiar las imágenes de base
del docker de java por cambio de nombres
parent 3fd9dd2e
Loading
Loading
Loading
Loading
+7 −5
Original line number Diff line number Diff line
FROM sgrio/java-oracle:jdk_8 AS build_apr
FROM sgrio/java:jdk_8_ubuntu AS build_apr

ENV APR_VERSION="1.6.5" \
	TOMCAT_NATIVE_VERSION="1.2.18" \
@@ -37,19 +37,19 @@ RUN apt-get update && \
	make install


FROM sgrio/java-oracle:jre_8
FROM sgrio/java:server_jre_8_ubuntu

LABEL maintainer="info@redmic.es"

ENV MARLIN_VERSION="0.9.3" \
	TOMCAT_MAJOR="8" \
	TOMCAT_VERSION="8.5.35" \
	TOMCAT_VERSION="8.5.40" \
	JAI_VERSION="1_1_3" \
	IMAGE_IO_VERSION="1_1" \
	GDAL_VERSION="2.2.3" \
	TURBO_JPEG_VERSION="1.5.3" \
	GEOSERVER_MAJOR_VERSION="2.14" \
	GEOSERVER_MINOR_VERSION="1" \
	GEOSERVER_MAJOR_VERSION="2.15" \
	GEOSERVER_MINOR_VERSION="0" \
	CATALINA_HOME="/usr/local/tomcat"

ENV GEOSERVER_HOME="${CATALINA_HOME}/webapps/geoserver"
@@ -185,6 +185,7 @@ 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/ && \
	#
@@ -237,6 +238,7 @@ RUN mkdir -p "${TEMP_PATH}" "${GEOSERVER_DATA_DIR}" "${GEOSERVER_LOG_DIR}" "${CA
	#
	# Install strong cryptography
	#
	mkdir -p ${JAVA_HOME}/lib/security/ && \
	mv /libs/*.jar ${JAVA_HOME}/lib/security/ && \
	#
	# Install locale