Actualiza comportamiento de CI (cf116e2d) · Commits · REDMIC Project / Server / User

.gitlab-ci.yml

+22 −9

Original line number	Diff line number	Diff line
		@@ -8,20 +8,21 @@ maven-build:
		stage: build
		image: redmic/maven-gitlab
		variables:
		MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
		SPRING_PROFILES_ACTIVE: test
		MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dspring.datasource.username=${DEV_SPRING_DATASOURCE_USERNAME} -Dspring.datasource.password=${DEV_SPRING_DATASOURCE_PASSWORD}"
		SPRING_DATASOURCE_USERNAME: ${DEV_SPRING_DATASOURCE_USERNAME}
		SPRING_DATASOURCE_PASSWORD: ${DEV_SPRING_DATASOURCE_PASSWORD}
		OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

		only:
		- branches
		except:
		- master
		cache:
		paths:
		- .m2/repository/
		script:
		- mvn verify ${MAVEN_OPTS} spring-boot:repackage ${MAVEN_OPTS} -B
		- mvn verify spring-boot:repackage -B
		- "COVERAGE=$(xmllint --html --xpath '//table[@id=\"coveragetable\"]/tfoot//td[@class=\"ctr2\"][1]/text()' target/site/jacoco/index.html)"
		- 'echo "Coverage: ${COVERAGE}"'
		after_script:
		@@ -95,13 +96,17 @@ deploy-dev:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		IMAGE_NAME: ${DOCKER_ENV_CI_REGISTRY_IMAGE}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=pre IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET}
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=pre SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME}
		SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		@@ -115,13 +120,17 @@ deploy-supporting-branch:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		IMAGE_NAME: ${DOCKER_ENV_CI_REGISTRY_IMAGE}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=pre IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET}
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=pre SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME}
		SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		@@ -139,13 +148,17 @@ deploy-pro:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		IMAGE_NAME: ${DOCKER_ENV_CI_REGISTRY_IMAGE}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_TAG}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		services:
		- docker:dind
		script:
		- deploy.sh SPRING_PROFILES_ACTIVE=prod IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} SPRING_DATASOURCE_USERNAME=${PRO_SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD=${PRO_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${PRO_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${PRO_OAUTH_CLIENT_SECRET}
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=prod SPRING_DATASOURCE_USERNAME=${PRO_SPRING_DATASOURCE_USERNAME}
		SPRING_DATASOURCE_PASSWORD=${PRO_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${PRO_OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${PRO_OAUTH_CLIENT_SECRET}
		environment:
		name: pro
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

Dockerfile

+3 −8

Original line number	Diff line number	Diff line
		@@ -2,13 +2,8 @@ FROM redmic/redmic-server

		COPY /dist/*.jar ./

		EXPOSE 8082
		EXPOSE ${MICROSERVICE_PORT}

		ENTRYPOINT java $JAVA_OPTS \
		ENTRYPOINT java ${JAVA_OPTS} \
		-Djava.security.egd=file:/dev/./urandom \
		-Dlogging.level.org.springframework=${LOG_LEVEL} \
		-Dspring.datasource.username=${SPRING_DATASOURCE_USERNAME} \
		-Dspring.datasource.password=${SPRING_DATASOURCE_PASSWORD} \
		-Doauth.client.id=${OAUTH_CLIENT_ID} \
		-Doauth.client.secret=${OAUTH_CLIENT_SECRET} \
		-jar ${DIRPATH}/user.jar
		-jar ${DIRPATH}/${MICROSERVICE_NAME}.jar

docker-compose.tmpl.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@ services:
		user:
		image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}
		environment:
		- MICROSERVICE_NAME
		- MICROSERVICE_PORT
		- SPRING_PROFILES_ACTIVE
		- SPRING_DATASOURCE_USERNAME
		- SPRING_DATASOURCE_PASSWORD