Commit b9b0e5fa authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'feature-java21' into 'dev'

Adapta construcción de imagen base redmic-server

See merge request redmic-project/docker/redmic-server!9
parents a16aaf82 9898d402
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
OPENJDK_IMAGE_TAG=8u312-jdk-slim-bullseye
WGET_VERSION=1.21-1+b1
BASE_IMAGE_TAG=21-jdk-alpine-3.21
DIRPATH=/app
DEFAULT_JAVA_OPTS=-XshowSettings:vm -XX:+PrintFlagsFinal -XX:InitialRAMPercentage=10.0 -XX:MinRAMPercentage=40.0 -XX:MaxRAMPercentage=50.0 -XX:+UseZGC -XX:+ZGenerational -Duser.country=ES -Duser.language=es
LOG_LEVEL=error
+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
+9 −12
Original line number Diff line number Diff line
ARG OPENJDK_IMAGE_TAG=8u312-jdk-slim-bullseye
FROM openjdk:${OPENJDK_IMAGE_TAG}
ARG BASE_IMAGE_TAG="21-jdk-alpine"
FROM eclipse-temurin:${BASE_IMAGE_TAG}

LABEL maintainer="info@redmic.es"

ARG WGET_VERSION=1.21-1+b1
ARG DIRPATH \
	DEFAULT_JAVA_OPTS \
	LOG_LEVEL

ENV DIRPATH=/opt/redmic \
	DEFAULT_JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom -XshowSettings:vm -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -Dlog4j.formatMsgNoLookups=true -Duser.country=ES -Duser.language=es" \
	LOG_LEVEL=error
ENV DEFAULT_JAVA_OPTS="${DEFAULT_JAVA_OPTS}" \
	LOG_LEVEL="${LOG_LEVEL}"

RUN apt-get update && apt-get install -y --no-install-recommends \
		wget="${WGET_VERSION}" && \
	rm -rf /var/lib/apt/lists/*
WORKDIR "${DIRPATH}"

WORKDIR ${DIRPATH}

ENTRYPOINT java ${DEFAULT_JAVA_OPTS} ${JAVA_OPTS} -jar "${DIRPATH}/${MICROSERVICE_NAME}.jar"
ENTRYPOINT java ${DEFAULT_JAVA_OPTS} ${JAVA_OPTS} -jar "${MICROSERVICE_NAME}.jar"
+4 −4
Original line number Diff line number Diff line
version: '3.5'

services:
  maven:
    image: ${IMAGE_NAME:-registry.gitlab.com/redmic-project/docker/redmic-server}:${IMAGE_TAG:-latest}
@@ -7,5 +5,7 @@ services:
      context: .
      dockerfile: ${DOCKERFILE:-Dockerfile}
      args:
        OPENJDK_IMAGE_TAG:
        WGET_VERSION:
        BASE_IMAGE_TAG:
        DIRPATH:
        DEFAULT_JAVA_OPTS:
        LOG_LEVEL:
+1 −1

File changed.

Contains only whitespace changes.