Commit b4814cb5 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Corrige ruta a base de datos de prod

See merge request redmic-project/server/user!2
parents 4bb7c288 a10fbd26

.gitlab-ci.yml

+60 −26
Original line number Diff line number Diff line
@@ -6,37 +6,39 @@ 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 -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}



    RECAPTCHA_SECRET: ${RECAPTCHA_SECRET}

  only:

    - branches

  cache:

    paths:

      - .m2/repository/

  script:

    - mvn verify ${MAVEN_OPTS} spring-boot:repackage -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:

    - 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:
@@ -45,12 +47,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-commit-master-branch:

  stage: package

  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-build-tag:

docker-tag-already-built-image:

  stage: package

  image: redmic/docker-gitlab

  image: docker:stable

  variables:

    DOCKER_DRIVER: overlay2

  services:
@@ -59,10 +81,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:
@@ -72,8 +94,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
@@ -84,24 +104,30 @@ 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: ${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_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} RECAPTCHA_SECRET=${RECAPTCHA_SECRET}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
@@ -110,18 +136,22 @@ 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: ${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_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} RECAPTCHA_SECRET=${RECAPTCHA_SECRET}

  environment:

    name: dev

    url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
@@ -134,21 +164,25 @@ 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_NAME: ${DOCKER_ENV_CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_TAG}

    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} 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} RECAPTCHA_SECRET=${RECAPTCHA_SECRET}

  environment:

    name: pro

    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

  only:

    - tags

    - master

  when: manual

Dockerfile

+7 −9
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 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

README.md

+2 −2
Original line number Diff line number Diff line 
|    Metrics    |                                                                                     Master                                                                                     |                                                                                  Develop                                                                                 |

|:-------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|

| CI status     | [![pipeline status](https://gitlab.com/redmic-project/server/userbadges/master/pipeline.svg)](https://gitlab.com/redmic-project/server/usercommits/master) | [![pipeline status](https://gitlab.com/redmic-project/server/userbadges/dev/pipeline.svg)](https://gitlab.com/redmic-project/server/usercommits/dev) |

| Test coverage | [![coverage report](https://gitlab.com/redmic-project/server/userbadges/master/coverage.svg)](https://gitlab.com/redmic-project/server/usercommits/master) | [![coverage report](https://gitlab.com/redmic-project/server/userbadges/dev/coverage.svg)](https://gitlab.com/redmic-project/server/usercommits/dev) |
 
 No newline at end of file
 
| CI status     | [![pipeline status](https://gitlab.com/redmic-project/server/userbadges/master/pipeline.svg)](https://gitlab.com/redmic-project/server/user/commits/master) | [![pipeline status](https://gitlab.com/redmic-project/server/userbadges/dev/pipeline.svg)](https://gitlab.com/redmic-project/server/user/commits/dev) |

| Test coverage | [![coverage report](https://gitlab.com/redmic-project/server/userbadges/master/coverage.svg)](https://gitlab.com/redmic-project/server/user/commits/master) | [![coverage report](https://gitlab.com/redmic-project/server/userbadges/dev/coverage.svg)](https://gitlab.com/redmic-project/server/user/commits/dev) |
 
 No newline at end of file

docker-compose.tmpl.yml

+3 −0
Original line number Diff line number Diff line
@@ -4,11 +4,14 @@ services: 
  user:

    image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}

    environment:

      - MICROSERVICE_NAME

      - MICROSERVICE_PORT

      - SPRING_PROFILES_ACTIVE

      - SPRING_DATASOURCE_USERNAME

      - SPRING_DATASOURCE_PASSWORD

      - OAUTH_CLIENT_ID

      - OAUTH_CLIENT_SECRET

      - RECAPTCHA_SECRET

      - JAVA_OPTS=-Xmx256m -Xss256m

    networks:

      - postgres-net

pom.xml

+102 −30
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>es.redmic</groupId>

		<artifactId>redmic</artifactId>

		<version>0.6.0</version>

		<groupId>org.springframework.boot</groupId>

		<artifactId>spring-boot-starter-parent</artifactId>

		<version>2.0.0.RELEASE</version>

		<relativePath />

	</parent>



	<modelVersion>4.0.0</modelVersion>

	<groupId>es.redmic</groupId>

	<artifactId>user</artifactId>

	<packaging>jar</packaging>

	<version>0.6.0</version>

	<name>User</name>

	<description>Gestión de cuentas y servicios de usuarios</description>

	<description>Account management and user services</description>

	

	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

		<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.db-commons.version>0.6.0</redmic.db-commons.version>

		<redmic.exceptions.version>0.6.0</redmic.exceptions.version>

		<redmic.models.version>0.6.0</redmic.models.version>

		<redmic.utils.version>0.6.0</redmic.utils.version>

		

		<!-- OTHERS -->

		<hibernate-validator.version>6.0.8.Final</hibernate-validator.version>

		<org.mockito.version>1.10.19</org.mockito.version>



		<!-- Plugins -->

		<jacoco.version>0.8.1</jacoco.version>

		<com.mysema.maven.version>1.1.3</com.mysema.maven.version>

		<com.mysema.querydsl.version>4.1.4</com.mysema.querydsl.version>

		

		<!-- Environment variables -->

		<env.MAVEN_REPO_URL>https://artifactory.redmic.net/artifactory</env.MAVEN_REPO_URL>

	</properties>



	<dependencies>

		<!-- redmic -->
@@ -20,19 +51,25 @@ 
		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>db-commons</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.db-commons.version}</version>

		</dependency>



		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>exceptions</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.exceptions.version}</version>

		</dependency>



		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>models</artifactId>

			<version>${redmic.version}</version>

			<version>${redmic.models.version}</version>

		</dependency>



		<dependency>

			<groupId>es.redmic.lib</groupId>

			<artifactId>utils</artifactId>

			<version>${redmic.utils.version}</version>

		</dependency>



		<!-- SpringBoot -->
@@ -40,7 +77,6 @@ 
		<dependency>

			<groupId>org.springframework.boot</groupId>

			<artifactId>spring-boot-starter-tomcat</artifactId>

			<scope>provided</scope>

		</dependency>



		<dependency>
@@ -55,16 +91,21 @@ 


		<!--others -->



		<dependency>

			<groupId>org.apache.httpcomponents</groupId>

			<artifactId>httpclient</artifactId>

		</dependency>

		

		<dependency>

			<groupId>org.hibernate</groupId>

			<artifactId>hibernate-validator</artifactId>

			<version>${hibernate-validator.version}</version>

			<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 -->
@@ -74,17 +115,29 @@ 
			<artifactId>spring-boot-starter-test</artifactId>

			<scope>test</scope>

		</dependency>

	</dependencies>

		

		<dependency>

			<groupId>org.mockito</groupId>

			<artifactId>mockito-all</artifactId>

			<version>${org.mockito.version}</version>

			<scope>test</scope>

		</dependency>

	</dependencies>

	<distributionManagement>

		<repository>

			<id>central</id>

			<name>redmic-releases</name>

			<url>${env.MAVEN_REPO_URL}/libs-release-local</url>

		</repository>

		<snapshotRepository>

			<id>snapshots</id>

			<name>redmic-snapshots</name>

			<url>${env.MAVEN_REPO_URL}/libs-snapshot-local</url>

			<uniqueVersion>false</uniqueVersion>

		</snapshotRepository>

	</distributionManagement>

	<build>

		<plugins>

			<plugin>

				<groupId>org.apache.maven.plugins</groupId>

				<artifactId>maven-install-plugin</artifactId>

				<configuration>

					<skip>true</skip>

				</configuration>

			</plugin>

			<plugin>

				<groupId>org.springframework.boot</groupId>

				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -104,7 +157,7 @@ 
			<plugin>

				<groupId>com.mysema.maven</groupId>

				<artifactId>apt-maven-plugin</artifactId>

				<version>${com.mysema.maven}</version>

				<version>${com.mysema.maven.version}</version>

				<executions>

					<execution>

						<goals>
@@ -121,11 +174,30 @@ 
					<dependency>

						<groupId>com.querydsl</groupId>

						<artifactId>querydsl-apt</artifactId>

						<version>${com.mysema.querydsl}</version>

						<version>${com.mysema.querydsl.version}</version>

					</dependency>

				</dependencies>

			</plugin>



			<plugin>

				<groupId>org.jacoco</groupId>

				<artifactId>jacoco-maven-plugin</artifactId>

				<version>${jacoco.version}</version>

				<executions>

					<execution>

						<id>pre-unit-test</id>

						<goals>

							<goal>prepare-agent</goal>

						</goals>

					</execution>

					<execution>

						<id>post-unit-test</id>

						<phase>test</phase>

						<goals>

							<goal>report</goal>

						</goals>

					</execution>

				</executions>

			</plugin>

		</plugins>

	</build>

</project>