Commit 29a14e12 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Actualiza versiones, define docker-compose 

Actualiza a última versión disponible basada en jdk8.
Actualiza dependencias.
Permite construcción de imagen mediante docker-compose.
parent 5e250ab2

.env

0 → 100644
+7 −0
Original line number Diff line number Diff line 
MAVEN_VERSION=3.6.3-jdk-8

GDAL_BIN_VERSION=2.4.0+dfsg-1+b1

LOCALES_VERSION=2.28-10

LIBXML2_UTILS_VERSION=2.9.4+dfsg1-7+deb10u1

DOCKER_VERSION=20.10.1

LANG=es_ES.UTF-8

DIRPATH=/opt/redmic

.gitlab-ci.yml

+4 −0
Original line number Diff line number Diff line
@@ -7,3 +7,7 @@ stages: 
  - pre-package

  - package

  - post-package



.docker-build:

  variables:

    COMPOSE_FILE_NAME: docker-compose.yml

Dockerfile

+5 −5
Original line number Diff line number Diff line 
ARG MAVEN_VERSION=3.5.3-jdk-8

ARG MAVEN_VERSION=3.6.3-jdk-8

FROM maven:${MAVEN_VERSION}



LABEL maintainer="info@redmic.es"



ARG GDAL_BIN_VERSION=2.1.2+dfsg-5 \

	LOCALES_VERSION=2.24-11+deb9u4 \

	LIBXML2_UTILS_VERSION=2.9.4+dfsg1-2.2+deb9u3

ARG GDAL_BIN_VERSION=2.4.0+dfsg-1+b1 \

	LOCALES_VERSION=2.28-10 \

	LIBXML2_UTILS_VERSION=2.9.4+dfsg1-7+deb10u1



RUN apt-get update && apt-get install -y --no-install-recommends \

		gdal-bin=${GDAL_BIN_VERSION} \
@@ -21,7 +21,7 @@ RUN sed -i -e 's/# ${LANG} UTF-8/${LANG} UTF-8/' /etc/locale.gen && \ 


ENV LANG=${LANG}



ARG DOCKER_VERSION=19.03.11

ARG DOCKER_VERSION=20.10.1



RUN wget -q -P /tmp/ https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz && \

	tar -xf /tmp/docker-${DOCKER_VERSION}.tgz --directory /tmp/ && \

docker-compose.yml

0 → 100644
+16 −0
Original line number Diff line number Diff line 
version: '3.5'



services:

  maven:

    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/docker/maven}:${IMAGE_TAG:-latest}

    build:

      context: .

      dockerfile: ${DOCKERFILE:-Dockerfile}

      args:

        MAVEN_VERSION:

        GDAL_BIN_VERSION:

        LOCALES_VERSION:

        LIBXML2_UTILS_VERSION:

        DOCKER_VERSION:

        LANG:

        DIRPATH: