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

.gitlab-ci.yml

+55 −24

Original line number	Diff line number	Diff line
		@@ -6,10 +6,11 @@ stages:

		maven-build:
		stage: build
		image: redmic/maven-gitlab
		image: registry.gitlab.com/redmic-project/docker/maven
		variables:
		MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
		SPRING_PROFILES_ACTIVE: test
		MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Daishub.service.username=${AISHUB_SERVICE_USERNAME}"
		AISHUB_SERVICE_USERNAME: ${AISHUB_SERVICE_USERNAME}
		only:
		- branches
		cache:
		@@ -22,16 +23,18 @@ maven-build:
		after_script:
		- rm -r .m2/repository/es
		artifacts:
		name: "${CI_PROJECT_NAME}"
		name: "${CI_PROJECT_NAME}-${CI_COMMIT_REF_NAME}"
		expire_in: '6 months'
		paths:
		- dist/*.jar

		docker-build-commit:
		docker-build-commit-non-master-branches:
		stage: package
		image: redmic/docker-gitlab
		image: docker:stable
		variables:
		DOCKER_DRIVER: overlay2
		PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server
		PARENT_IMAGE_TAG: latest
		services:
		- docker:dind
		only:
		@@ -40,12 +43,32 @@ docker-build-commit:
		- master
		script:
		- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
		- docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .
		- >
		docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}
		-t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .
		- docker push ${CI_REGISTRY_IMAGE}

		docker-build-tag:
		docker-build-commit-master-branch:
		stage: package
		image: redmic/docker-gitlab
		image: docker:stable
		variables:
		DOCKER_DRIVER: overlay2
		PARENT_IMAGE_NAME: registry.gitlab.com/redmic-project/docker/redmic-server
		PARENT_IMAGE_TAG: latest
		services:
		- docker:dind
		only:
		- master
		script:
		- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
		- >
		docker build --build-arg PARENT_IMAGE_NAME=${PARENT_IMAGE_NAME} --build-arg PARENT_IMAGE_TAG=${PARENT_IMAGE_TAG}
		-t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:latest .
		- docker push ${CI_REGISTRY_IMAGE}

		docker-tag-already-built-image:
		stage: package
		image: docker:stable
		variables:
		DOCKER_DRIVER: overlay2
		services:
		@@ -54,10 +77,10 @@ docker-build-tag:
		- tags
		script:
		- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
		- docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG} -t ${CI_REGISTRY_IMAGE}:latest .
		- docker tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG}
		- docker push ${CI_REGISTRY_IMAGE}

		container_scanning:
		container-scanning:
		stage: test-package
		image: docker:stable
		variables:
		@@ -67,8 +90,6 @@ container_scanning:
		- docker:stable-dind
		only:
		- branches
		except:
		- master
		script:
		- docker run -d --name db arminc/clair-db:latest
		- docker run -p 6060:6060 --link db:postgres -d --name clair arminc/clair-local-scan:v2.0.1
		@@ -79,24 +100,29 @@ container_scanning:
		- mv clair-scanner_linux_amd64 clair-scanner
		- chmod +x clair-scanner
		- touch clair-whitelist.yml
		- ./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log -w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} \|\| true
		- >
		./clair-scanner -c http://docker:6060 --ip $(hostname -i) -r gl-sast-container-report.json -l clair.log
		-w clair-whitelist.yml ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} \|\| true
		artifacts:
		paths: [gl-sast-container-report.json]

		deploy-dev:
		stage: deploy
		image: redmic/docker-gitlab
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		JAVA_OPTS: -Xmx512m -Xss512m -Daishub.service.username=${AISHUB_SERVICE_USERNAME}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=pre IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} JAVA_OPTS=${JAVA_OPTS}
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=pre AISHUB_SERVICE_USERNAME=${AISHUB_SERVICE_USERNAME}
		APP_SCHEDULING_ENABLE=${APP_SCHEDULING_ENABLE}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		@@ -105,18 +131,21 @@ deploy-dev:

		deploy-supporting-branch:
		stage: deploy
		image: redmic/docker-gitlab
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		JAVA_OPTS: -Xmx512m -Xss512m -Daishub.service.username=${AISHUB_SERVICE_USERNAME}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=pre IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} JAVA_OPTS=${JAVA_OPTS}
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=pre AISHUB_SERVICE_USERNAME=${AISHUB_SERVICE_USERNAME}
		APP_SCHEDULING_ENABLE=${APP_SCHEDULING_ENABLE}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		@@ -129,21 +158,23 @@ deploy-supporting-branch:

		deploy-pro:
		stage: deploy
		image: redmic/docker-gitlab
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		IMAGE_TAG: ${CI_COMMIT_TAG}
		JAVA_OPTS: -Xmx512m -Xss512m -Daishub.service.username=${AISHUB_SERVICE_USERNAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=prod IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} JAVA_OPTS=${JAVA_OPTS}
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=prod AISHUB_SERVICE_USERNAME=${AISHUB_SERVICE_USERNAME}
		environment:
		name: pro
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		only:
		- tags
		- master
		when: manual

Dockerfile

+7 −5

Original line number	Diff line number	Diff line
		FROM redmic/redmic-server
		ARG PARENT_IMAGE_NAME
		ARG PARENT_IMAGE_TAG

		FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}

		COPY /dist/*.jar ./

		EXPOSE 8090
		EXPOSE ${MICROSERVICE_PORT}

		ENTRYPOINT java $JAVA_OPTS \
		ENTRYPOINT java ${JAVA_OPTS} \
		-Djava.security.egd=file:/dev/./urandom \
		-Dlogging.level.org.springframework=${LOG_LEVEL} \
		-jar ${DIRPATH}/ais.jar
		-jar ${DIRPATH}/${MICROSERVICE_NAME}.jar

docker-compose.prod.yml

+0 −2

Original line number	Diff line number	Diff line
		@@ -2,8 +2,6 @@ version: '3.5'

		services:
		ais:
		ports:
		- ${MICROSERVICE_PORT}
		networks:
		- traefik-net
		deploy:

docker-compose.tmpl.yml

+6 −2

Original line number	Diff line number	Diff line
		@@ -2,10 +2,14 @@ version: '3.5'

		services:
		ais:
		image: registry.redmic.net/redmic-server/${MICROSERVICE_NAME}:${IMAGE_TAG:-latest}
		image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}
		environment:
		- MICROSERVICE_NAME
		- MICROSERVICE_PORT
		- SPRING_PROFILES_ACTIVE
		- JAVA_OPTS
		- AISHUB_SERVICE_USERNAME
		- APP_SCHEDULING_ENABLE
		- JAVA_OPTS=-Xmx512m -Xss512m
		networks:
		- kafka-net
		- redmic-net

pom.xml

+57 −1

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.0.RELEASE</version>
		<version>2.0.3.RELEASE</version>
		<relativePath/>
		</parent>

		@@ -29,9 +29,12 @@
		<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>

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

		<!-- Plugins -->
		<jacoco.version>0.8.1</jacoco.version>
		@@ -82,6 +85,17 @@
		<scope>provided</scope>
		</dependency>

		<!-- Logs -->
		<dependency>
		<groupId>org.apache.logging.log4j</groupId>
		<artifactId>log4j-api</artifactId>
		</dependency>

		<dependency>
		<groupId>org.apache.logging.log4j</groupId>
		<artifactId>log4j-core</artifactId>
		</dependency>

		<!-- tests -->

		<dependency>
		@@ -90,12 +104,54 @@
		<scope>test</scope>
		</dependency>

		<dependency>
		<groupId>es.redmic.lib</groupId>
		<artifactId>test-utils</artifactId>
		<version>${redmic.test-utils.version}</version>
		<scope>test</scope>
		</dependency>

		<dependency>
		<groupId>org.springframework.kafka</groupId>
		<artifactId>spring-kafka-test</artifactId>
		<scope>test</scope>
		</dependency>

		<dependency>
		<groupId>org.apache.kafka</groupId>
		<artifactId>kafka-clients</artifactId>
		<version>${kafka.version}</version>
		<classifier>test</classifier>
		</dependency>

		<dependency>
		<groupId>org.apache.kafka</groupId>
		<artifactId>kafka_2.11</artifactId>
		<scope>test</scope>
		</dependency>

		<dependency>
		<groupId>org.apache.kafka</groupId>
		<artifactId>kafka_2.11</artifactId>
		<version>${kafka.version}</version>
		<classifier>test</classifier>
		<scope>test</scope>
		</dependency>

		<dependency>
		<groupId>org.powermock</groupId>
		<artifactId>powermock-api-easymock</artifactId>
		<version>${powermock.version}</version>
		<scope>test</scope>
		</dependency>
		</dependencies>
		<repositories>
		<repository>
		<id>confluent</id>
		<name>Confluent</name>
		<url>https://packages.confluent.io/maven/</url>
		</repository>
		</repositories>
		<build>
		<plugins>
		<plugin>