Commit 07691f41 authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/server/kafka-streams/vessel-restriction-checker!2
parents ea0a1e55 b44ba900

.dockerignore

+1 −0
Original line number Diff line number Diff line 
*

!/target/*.jar

!/target/dependency/*.jar

.gitlab-ci.yml

+8 −0
Original line number Diff line number Diff line
@@ -21,5 +21,13 @@ stages: 


variables:

  MAVEN_GOALS: package dependency:copy-dependencies

  BUILD_OUTPUT_PATH: target

  DEPENDENCIES_OUTPUT_PATH: dependency

  DOCKER_BUILD_ARGS: --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}

  STACK: kafka-streams



.maven-build:

  artifacts:

    paths:

      - ${PROJECT_ROOT_PATH}/${BUILD_OUTPUT_PATH}/*.jar

      - ${PROJECT_ROOT_PATH}/${BUILD_OUTPUT_PATH}/${DEPENDENCIES_OUTPUT_PATH}/*.jar

Dockerfile

+6 −4
Original line number Diff line number Diff line 
ARG PARENT_IMAGE_NAME openjdk

ARG PARENT_IMAGE_TAG 14-alpine

ARG PARENT_IMAGE_NAME=adoptopenjdk/openjdk8

ARG PARENT_IMAGE_TAG=jdk8u222-b10-slim



FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}
@@ -7,5 +7,7 @@ LABEL maintainer="info@redmic.es" 


COPY /target/*.jar ./



CMD ["java", "-cp", "./vesselrestrictionchecker.jar:./dependency/*", \

	"es.redmic.kafkastreams.vesselrestrictionchecker.VesselRestrictionCheckerApplication"]
 
COPY /target/dependency/*.jar ./dependency/



CMD ["java", "-cp", "./vessel-restriction-checker.jar:./dependency/*", \

	"es.redmic.vesselrestrictionchecker.VesselRestrictionCheckerApplication"]

deploy/.env

+2 −0
Original line number Diff line number Diff line 
APP_ID={{.Service.Name}}-{{.Task.Slot}}

RESULT_TOPIC=vessel.restriction.result

JAVA_OPTS=-XX:MaxRAMFraction=2

deploy/docker-compose.tmpl.yml

+5 −2
Original line number Diff line number Diff line
@@ -4,9 +4,12 @@ services: 
  vessel-restriction-checker:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      APP_ID: {{.Service.Name}}-{{.Task.Slot}}

      APP_ID:

      BOOTSTRAP_SERVERS:

      SCHEMA_REGISTRY:

      AREAS_TOPIC:

      POINTS_TOPIC:

      RESULT_TOPIC:

      JAVA_OPTS:

    networks:

      kafka-net:
@@ -16,7 +19,7 @@ services: 
      replicas: 1

      restart_policy:

        delay: 10s

      update_policy:

      update_config:

        delay: 1m

      resources:

        limits: