Commit 9fe1b4c3 authored by Noel Alonso's avatar Noel Alonso
Browse files

Adapta construcción de imagen base maven 

Hereda de una nueva base de java 21 jdk
Limpia instalaciones no necesarias para nuevos microservicios
Adapta gitlabci a nuevas plantillas
parent a57f60ff

.env

+2 −5
Original line number Diff line number Diff line 
MAVEN_IMAGE_TAG=3.8.4-openjdk-8-slim

GDAL_BIN_VERSION=2.4.0+dfsg-1+b1

LIBXML2_UTILS_VERSION=2.9.10+dfsg-6.7

DOCKER_VERSION=20.10.11

DIRPATH=/opt/redmic

BASE_IMAGE_TAG=21-jdk-alpine-3.21

DIRPATH=/app

MAVEN_OPTS=-Duser.country=ES -Duser.language=es

.gitlab-ci.yml

+1 −5
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/packaging.yml'

    file: '/packaging-docker/docker-build.yml'



stages:

  - pre-package

  - package

  - post-package
 


.docker-build:

  variables:

    COMPOSE_FILE_NAME: docker-compose.yml

Dockerfile

+4 −18
Original line number Diff line number Diff line 
ARG MAVEN_IMAGE_TAG=3.8.4-openjdk-8-slim

FROM maven:${MAVEN_IMAGE_TAG}

ARG BASE_IMAGE_TAG="21-jdk-alpine"

FROM eclipse-temurin:${BASE_IMAGE_TAG}



LABEL maintainer="info@redmic.es"



ARG GDAL_BIN_VERSION=2.4.0+dfsg-1+b1 \

	LIBXML2_UTILS_VERSION=2.9.10+dfsg-6.7 \

	DOCKER_VERSION=20.10.11 \

	DIRPATH=/opt/redmic \

ARG DIRPATH \

	MAVEN_OPTS="-Duser.country=ES -Duser.language=es"



ENV MAVEN_OPTS=${MAVEN_OPTS}



RUN echo "deb http://deb.debian.org/debian buster main" >> /etc/apt/sources.list && \

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

		gdal-bin="${GDAL_BIN_VERSION}" \

		libxml2-utils="${LIBXML2_UTILS_VERSION}" && \

	rm -rf /var/lib/apt/lists/* && \

	curl -s -o /tmp/docker.tgz \

		"https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" && \

	tar -xf /tmp/docker.tgz --directory /tmp/ && \

	mv /tmp/docker/docker /usr/local/bin && \

	rm -rf docker.tgz /tmp/docker

WORKDIR "${DIRPATH}"



COPY config/settings.xml /root/.m2/
 


WORKDIR ${DIRPATH}

docker-compose.yml→compose.yaml

+1 −6
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}
@@ -7,9 +5,6 @@ services: 
      context: .

      dockerfile: ${DOCKERFILE:-Dockerfile}

      args:

        MAVEN_IMAGE_TAG:

        GDAL_BIN_VERSION:

        LIBXML2_UTILS_VERSION:

        DOCKER_VERSION:

        BASE_IMAGE_TAG:

        DIRPATH:

        MAVEN_OPTS:

README.md

+1 −1

File changed.

Contains only whitespace changes.