Merge branch 'dev' into 'master' (a7d7d4c9) · Commits · REDMIC Project / Server / Tasks

.gitlab-ci.yml

+16 −6

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
		@@ -85,6 +85,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}

		@@ -116,12 +117,13 @@ 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}
		STACK: api
		SERVICES_TO_CHECK: api_${CI_PROJECT_NAME}
		STATUS_CHECK_DELAY: 300
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		@@ -133,6 +135,7 @@ deploy-dev:
		AWS_ACCESS_KEY: ${DEV_AWS_ACCESS_KEY}
		AWS_SECRET_KEY: ${DEV_AWS_SECRET_KEY}
		ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		@@ -142,20 +145,22 @@ deploy-dev:
		SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} JOBS_DATASOURCE_USERNAME=${JOBS_DATASOURCE_USERNAME}
		JOBS_DATASOURCE_PASSWORD=${JOBS_DATASOURCE_PASSWORD} AWS_ACCESS_KEY=${AWS_ACCESS_KEY}
		AWS_SECRET_KEY=${AWS_SECRET_KEY} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}
		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}
		STACK: api
		SERVICES_TO_CHECK: api_${CI_PROJECT_NAME}
		STATUS_CHECK_DELAY: 300
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		@@ -167,6 +172,7 @@ deploy-supporting-branch:
		AWS_ACCESS_KEY: ${DEV_AWS_ACCESS_KEY}
		AWS_SECRET_KEY: ${DEV_AWS_SECRET_KEY}
		ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		@@ -176,9 +182,10 @@ deploy-supporting-branch:
		SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} JOBS_DATASOURCE_USERNAME=${JOBS_DATASOURCE_USERNAME}
		JOBS_DATASOURCE_PASSWORD=${JOBS_DATASOURCE_PASSWORD} AWS_ACCESS_KEY=${AWS_ACCESS_KEY}
		AWS_SECRET_KEY=${AWS_SECRET_KEY} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}
		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:
		@@ -188,12 +195,13 @@ 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}
		STACK: api
		SERVICES_TO_CHECK: api_${CI_PROJECT_NAME}
		STATUS_CHECK_DELAY: 300
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		@@ -205,6 +213,7 @@ deploy-pro:
		AWS_ACCESS_KEY: ${PRO_AWS_ACCESS_KEY}
		AWS_SECRET_KEY: ${PRO_AWS_SECRET_KEY}
		ELASTIC_XPACKSECURITYUSER: ${PRO_ELASTIC_XPACKSECURITYUSER}
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		script:
		@@ -214,6 +223,7 @@ deploy-pro:
		SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} JOBS_DATASOURCE_USERNAME=${JOBS_DATASOURCE_USERNAME}
		JOBS_DATASOURCE_PASSWORD=${JOBS_DATASOURCE_PASSWORD} AWS_ACCESS_KEY=${AWS_ACCESS_KEY}
		AWS_SECRET_KEY=${AWS_SECRET_KEY} ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}
		PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: pro
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

deploy/docker-compose.dev.yml

+0 −14

Original line number	Diff line number	Diff line
		@@ -2,21 +2,7 @@ version: '3.5'

		services:
		tasks:
		ports:
		- target: ${MICROSERVICE_PORT}
		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:
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '1'

deploy/docker-compose.prod.yml

+2 −12

Original line number	Diff line number	Diff line
		@@ -3,25 +3,15 @@ version: '3.5'
		services:
		tasks:
		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:
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '1'
		memory: 1G
		memory: 2G
		reservations:
		memory: 820M
		memory: 1639M

		volumes:
		mediastorage-private-vol:

deploy/docker-compose.tmpl.yml

+12 −2

Original line number	Diff line number	Diff line
		@@ -25,11 +25,21 @@ services:
		- mediastorage-private-vol:/data/MEDIA_STORAGE
		- mediastorage-public-vol:/data/PUBLIC_MEDIA_STORAGE
		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: 4m
		start_period: 5m
		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:
		delay: 1m
		window: 3m

		networks:
		elastic-net:

pom.xml

+10 −16

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		<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 +13,7 @@
		<groupId>es.redmic</groupId>
		<artifactId>tasks</artifactId>
		<packaging>jar</packaging>
		<version>0.6.0</version>
		<version>0.7.0</version>
		<name>Tasks</name>
		<description>Tasks server</description>

		@@ -33,12 +33,13 @@
		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>
		<redmic.models.version>0.6.0</redmic.models.version>
		<redmic.mediastorage.version>0.6.0</redmic.mediastorage.version>
		<redmic.broker-lib.version>0.6.0</redmic.broker-lib.version>
		<redmic.broker-lib.version>0.8.0</redmic.broker-lib.version>
		<redmic.test-utils.version>0.6.0</redmic.test-utils.version>

		<!-- OTHER -->
		<powermock.version>1.7.3</powermock.version>
		<kafka.version>1.1.0</kafka.version>
		<kafka.version>2.0.0</kafka.version>
		<elasticsearch.version>5.6.1</elasticsearch.version>

		<!-- Plugins -->
		<jacoco.version>0.8.1</jacoco.version>
		@@ -196,18 +197,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>tasks</finalName>
		<outputDirectory>dist</outputDirectory>
		</configuration>
		</execution>
		</executions>
		</plugin>
		<plugin>
		<groupId>org.apache.maven.plugins</groupId>