Merge branch 'dev' into 'master' (3cbeb123) · Commits · REDMIC Project / Server / Socket

.gitlab-ci.yml

+13 −9

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

		@@ -112,7 +113,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}
		@@ -124,22 +125,23 @@ deploy-dev:
		SPRING_PROFILES_ACTIVE: pre
		OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}
		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} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} 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}
		@@ -151,16 +153,17 @@ deploy-supporting-branch:
		SPRING_PROFILES_ACTIVE: pre
		OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}
		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} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} 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:
		@@ -170,7 +173,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}
		@@ -182,13 +185,14 @@ deploy-pro:
		SPRING_PROFILES_ACTIVE: prod
		OAUTH_CLIENT_ID: ${PRO_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}
		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} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		environment:
		name: pro
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

deploy/docker-compose.dev.yml

+0 −17

Original line number	Diff line number	Diff line
		@@ -6,20 +6,3 @@ services:
		- 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};ReplacePathRegex:^/api/${MICROSERVICE_NAME}/(.*)$$ /api/${MICROSERVICE_NAME}/msg/$$1
		traefik.backend: ${MICROSERVICE_NAME}
		restart_policy:
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 512M
		reservations:
		memory: 410M

deploy/docker-compose.prod.yml

+0 −16

Original line number	Diff line number	Diff line
		@@ -3,22 +3,6 @@ version: '3.5'
		services:
		socket:
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "${MICROSERVICE_PORT}"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: PathPrefix:/api/${MICROSERVICE_NAME};ReplacePathRegex:^/api/${MICROSERVICE_NAME}/(.*)$$ /api/${MICROSERVICE_NAME}/msg/$$1
		traefik.backend: ${MICROSERVICE_NAME}
		placement:
		constraints:
		- node.role == worker
		restart_policy:
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 512M
		reservations:
		memory: 410M

deploy/docker-compose.tmpl.yml

+19 −3

Original line number	Diff line number	Diff line
		@@ -9,17 +9,33 @@ services:
		- SPRING_PROFILES_ACTIVE
		- OAUTH_CLIENT_ID
		- OAUTH_CLIENT_SECRET
		- JAVA_OPTS=-XX:MaxRAMFraction=1
		- JAVA_OPTS=-XX:MaxRAMFraction=2
		networks:
		- kafka-net
		- 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
		start_period: 3m
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.frontend.rule: Host:${PUBLIC_HOSTNAME};PathPrefix:/api/${MICROSERVICE_NAME};ReplacePathRegex:^(/api/${MICROSERVICE_NAME})/(info\|[0-9]+/.*)$$ $$1/msg/$$2
		traefik.backend: ${MICROSERVICE_NAME}
		traefik.port: "${MICROSERVICE_PORT}"
		restart_policy:
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '0.5'
		memory: 512M
		reservations:
		memory: 410M

		networks:
		kafka-net:

pom.xml

+3 −17

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		<groupId>es.redmic</groupId>
		<artifactId>socket</artifactId>
		<packaging>jar</packaging>
		<version>0.6.0</version>
		<version>0.7.0</version>
		<name>socket</name>
		<description>Websocket server</description>

		@@ -23,7 +23,6 @@
		<maven.compiler.source>1.8</maven.compiler.source>
		<maven.compiler.target>1.8</maven.compiler.target>
		<java.version>1.8</java.version>
		<tomcat.version>8.5.28</tomcat.version>

		<!-- REDMIC -->
		<redmic.broker-lib.version>0.6.0</redmic.broker-lib.version>
		@@ -61,26 +60,13 @@
		</dependency>

		<!-- Spring -->
		<dependency>
		<groupId>org.springframework.boot</groupId>
		<artifactId>spring-boot-starter-tomcat</artifactId>
		</dependency>

		<dependency>
		<groupId>org.springframework.boot</groupId>
		<artifactId>spring-boot-starter-websocket</artifactId>
		<exclusions>
		<exclusion>
		<groupId>org.slf4j</groupId>
		<artifactId>slf4j-api</artifactId>
		</exclusion>
		<exclusion>
		<groupId>org.slf4j</groupId>
		<artifactId>slf4j-log4j12</artifactId>
		</exclusion>
		<exclusion>
		<groupId>org.slf4j</groupId>
		<artifactId>log4j-over-slf4j</artifactId>
		<groupId>org.springframework.boot</groupId>
		<artifactId>spring-boot-starter-logging</artifactId>
		</exclusion>
		</exclusions>
		</dependency>