Merge branch 'dev' into 'master' (eb943cb7) · Commits · REDMIC Project / Server / AIS

.gitlab-ci.yml

+13 −8

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ stages:

		maven-build:
		stage: build
		image: registry.gitlab.com/redmic-project/docker/maven
		image: registry.gitlab.com/redmic-project/docker/maven:${MAVEN_IMAGE_TAG}
		variables:
		MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
		SPRING_PROFILES_ACTIVE: test
		@@ -77,6 +77,7 @@ docker-tag-already-built-image:
		- tags
		script:
		- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
		- docker pull ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}
		- docker tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}
		- docker push ${CI_REGISTRY_IMAGE}

		@@ -108,7 +109,7 @@ container-scanning:

		deploy-dev:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		@@ -119,22 +120,23 @@ deploy-dev:
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		SPRING_PROFILES_ACTIVE: pre
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} AISHUB_SERVICE_USERNAME=${AISHUB_SERVICE_USERNAME}
		APP_SCHEDULING_ENABLE=${APP_SCHEDULING_ENABLE}
		APP_SCHEDULING_ENABLE=${APP_SCHEDULING_ENABLE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		only:
		- dev

		deploy-supporting-branch:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		@@ -145,16 +147,17 @@ deploy-supporting-branch:
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		SPRING_PROFILES_ACTIVE: pre
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} AISHUB_SERVICE_USERNAME=${AISHUB_SERVICE_USERNAME}
		APP_SCHEDULING_ENABLE=${APP_SCHEDULING_ENABLE}
		APP_SCHEDULING_ENABLE=${APP_SCHEDULING_ENABLE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		only:
		- branches
		except:
		@@ -164,7 +167,7 @@ deploy-supporting-branch:

		deploy-pro:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:${DOCKER_DEPLOY_IMAGE_TAG}
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		@@ -175,12 +178,14 @@ deploy-pro:
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		SPRING_PROFILES_ACTIVE: prod
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} AISHUB_SERVICE_USERNAME=${AISHUB_SERVICE_USERNAME}
		PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: pro
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

deploy/docker-compose.dev.yml

+0 −11

Original line number	Diff line number	Diff line
		@@ -7,17 +7,6 @@ services:
		published: ${MICROSERVICE_PORT}
		mode: host
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "${MICROSERVICE_PORT}"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: PathPrefix:/api/${MICROSERVICE_NAME}
		traefik.backend: ${MICROSERVICE_NAME}
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'

deploy/docker-compose.prod.yml

+2 −13

Original line number	Diff line number	Diff line
		@@ -3,23 +3,12 @@ version: '3.5'
		services:
		ais:
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "${MICROSERVICE_PORT}"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: PathPrefix:/api/${MICROSERVICE_NAME}
		traefik.backend: ${MICROSERVICE_NAME}
		placement:
		constraints:
		- node.role == worker
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 512M
		memory: 1G
		reservations:
		memory: 410M
		memory: 820M

deploy/docker-compose.tmpl.yml

+14 −1

Original line number	Diff line number	Diff line
		@@ -15,16 +15,29 @@ services:
		- redmic-net
		- traefik-net
		healthcheck:
		test: wget --spider -S -t 3 http://localhost:${MICROSERVICE_PORT}/api/${MICROSERVICE_NAME}/actuator/health
		test: wget --spider -q http://localhost:${MICROSERVICE_PORT}/api/${MICROSERVICE_NAME}/actuator/health
		interval: 30s
		timeout: 10s
		retries: 3
		start_period: 2m
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefix:/api/${MICROSERVICE_NAME}
		traefik.backend: ${MICROSERVICE_NAME}
		traefik.port: "${MICROSERVICE_PORT}"
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m

		networks:
		kafka-net:
		external: true

		redmic-net:
		external: true

		traefik-net:
		external: true

pom.xml

+33 −32

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
		<project xmlns="http://maven.apache.org/POM/4.0.0"
		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

		<parent>
		<groupId>org.springframework.boot</groupId>
		<artifactId>spring-boot-starter-parent</artifactId>
		<version>2.0.3.RELEASE</version>
		<version>2.1.0.RELEASE</version>
		<relativePath />
		</parent>

		@@ -13,7 +14,7 @@
		<groupId>es.redmic</groupId>
		<artifactId>ais</artifactId>
		<packaging>jar</packaging>
		<version>0.6.0</version>
		<version>0.8.0</version>
		<name>AIS</name>
		<description>AIS rest consumer. Read vessels tracking and send to REDMIC system</description>

		@@ -26,13 +27,14 @@
		<tomcat.version>8.5.28</tomcat.version>

		<!-- REDMIC -->
		<redmic.broker-lib.version>0.6.0</redmic.broker-lib.version>
		<redmic.utils.version>0.6.0</redmic.utils.version>
		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>
		<redmic.test-utils.version>0.6.0</redmic.test-utils.version>
		<redmic.broker-lib.version>0.8.0</redmic.broker-lib.version>
		<redmic.vessels-lib.version>0.8.0</redmic.vessels-lib.version>
		<redmic.utils.version>0.8.0</redmic.utils.version>
		<redmic.exceptions.version>0.7.0</redmic.exceptions.version>
		<redmic.test-utils.version>0.8.0</redmic.test-utils.version>

		<!-- OTHERS -->
		<kafka.version>1.1.0</kafka.version>
		<kafka.version>2.0.1</kafka.version>
		<commons-io.version>2.6</commons-io.version>
		<powermock.version>1.7.3</powermock.version>

		@@ -66,6 +68,12 @@
		<version>${redmic.broker-lib.version}</version>
		</dependency>

		<dependency>
		<groupId>es.redmic.vessels</groupId>
		<artifactId>vessels-lib</artifactId>
		<version>${redmic.vessels-lib.version}</version>
		</dependency>

		<dependency>
		<groupId>es.redmic.lib</groupId>
		<artifactId>utils</artifactId>
		@@ -157,18 +165,11 @@
		<plugin>
		<groupId>org.springframework.boot</groupId>
		<artifactId>spring-boot-maven-plugin</artifactId>
		<executions>
		<execution>
		<goals>
		<goal>repackage</goal>
		</goals>
		<configuration>
		<executable>true</executable>
		<finalName>ais</finalName>
		<outputDirectory>dist</outputDirectory>
		</configuration>
		</execution>
		</executions>
		</plugin>
		<plugin>
		<groupId>org.jacoco</groupId>