Actualiza template (704ef4c4) · Commits · REDMIC Project / Server / Security manager

.gitlab-ci.yml

+41 −23

Original line number	Diff line number	Diff line
		@@ -6,14 +6,12 @@ stages:

		maven-build:
		stage: build
		image: registry.gitlab.com/redmic-project/docker/maven:latest
		image: registry.gitlab.com/redmic-project/docker/maven
		variables:
		MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
		SPRING_PROFILES_ACTIVE: test
		only:
		- branches
		except:
		- master
		cache:
		paths:
		- .m2/repository/
		@@ -24,12 +22,12 @@ 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: docker:stable
		variables:
		@@ -49,7 +47,7 @@ docker-build-commit:
		-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: docker:stable
		variables:
		@@ -59,15 +57,29 @@ docker-build-tag:
		services:
		- docker:dind
		only:
		- tags
		- 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_TAG} -t ${CI_REGISTRY_IMAGE}:latest .
		-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:
		- docker:dind
		only:
		- tags
		script:
		- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
		- 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:
		@@ -77,8 +89,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
		@@ -89,26 +99,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: registry.gitlab.com/redmic-project/docker/docker-deploy:latest
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		STACK: ${CI_PROJECT_NAME}
		SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		SPRING_PROFILES_ACTIVE: pre
		services:
		- docker:dind
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=pre
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		@@ -117,20 +131,22 @@ deploy-dev:

		deploy-supporting-branch:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest
		image: registry.gitlab.com/redmic-project/docker/docker-deploy
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		STACK: ${CI_PROJECT_NAME}
		SERVICES_TO_CHECK: ${CI_PROJECT_NAME}_${CI_PROJECT_NAME}
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		SPRING_PROFILES_ACTIVE: pre
		services:
		- docker:dind
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=pre
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		@@ -143,23 +159,25 @@ deploy-supporting-branch:

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

Dockerfile

+1 −5

Original line number	Diff line number	Diff line
		@@ -6,7 +6,3 @@ FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}
		COPY /dist/*.jar ./

		EXPOSE ${MICROSERVICE_PORT}
		No newline at end of file

		ENTRYPOINT java ${JAVA_OPTS} \
		-Djava.security.egd=file:/dev/./urandom \
		-jar ${DIRPATH}/${MICROSERVICE_NAME}.jar

README.md

+4 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ Este proyecto sirve de guía para la creación de un nuevo microservicio.

		3. Revisar el resto de ficheros del proyecto, remplazando `template` por el nombre adecuado (incluyendo la primera línea de este mismo fichero).

		4. Modificar el puerto del microservicio, reemplazando `port` en los ficheros `.env` y `src/main/resources/application.properties`.
		4. Modificar el puerto del microservicio, reemplazando `port` en los ficheros `deploy/.env` y `src/main/resources/application.properties`.

		5. En este último fichero `application.properties`, reemplazar el valor de la propiedad `server.servlet-path` por la ruta deseada (en lugar del valor por defecto `path`).

		@@ -23,4 +23,6 @@ Este proyecto sirve de guía para la creación de un nuevo microservicio.

		7. Configurar en el fichero `pom.xml` el spring-boot-starter adecuado y añadir las dependencias deseadas.

		8. Actualizar la tabla inicial de estado, eliminar estas instrucciones y documentar adecuadamente.
		8. En el fichero .gitlab-ci.yml, modificar STACK y SERVICES_TO_CHECK en todos los enviroment, en caso de no querer el valor por defecto, que es el nombre del propio servicio.

		9. Actualizar la tabla inicial de estado, eliminar estas instrucciones y documentar adecuadamente.

.env→deploy/.env

+0 −0

File moved.

View file

deploy/docker-compose.dev.yml

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		version: '3.5'

		services:
		template:
		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: '0.5'
		memory: 512M
		reservations:
		memory: 410M