Pone al día el template (99f91643) · Commits · REDMIC Project / Server / Security manager

.env

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		MICROSERVICE_NAME=template
		MICROSERVICE_PORT=port

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,5 +2,6 @@
		!.gitignore
		!.gitlab-ci.yml
		!.dockerignore
		!.env
		target
		dist

.gitlab-ci.yml

+15 −7

Original line number	Diff line number	Diff line
		@@ -8,10 +8,12 @@ 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"
		only:
		- branches
		except:
		- master
		cache:
		paths:
		- .m2/repository/
		@@ -90,13 +92,15 @@ deploy-dev:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		ACTIVE_PROFILE: pre
		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=${ACTIVE_PROFILE} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=pre
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		@@ -110,13 +114,15 @@ deploy-supporting-branch:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		ACTIVE_PROFILE: pre
		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=${ACTIVE_PROFILE} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=pre
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}
		@@ -134,13 +140,15 @@ deploy-pro:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		SERVICE: ${CI_PROJECT_NAME}
		ACTIVE_PROFILE: prod
		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=${ACTIVE_PROFILE} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		SPRING_PROFILES_ACTIVE=prod
		environment:
		name: pro
		url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}

Dockerfile

+3 −4

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

		COPY /dist/*.jar ./

		EXPOSE port
		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}/template.jar
		-jar ${DIRPATH}/${MICROSERVICE_NAME}.jar

README.md

+10 −3

Original line number	Diff line number	Diff line
		[![pipeline status](https://git.redmic.net/redmic-server/template/badges/dev/pipeline.svg)](https://git.redmic.net/redmic-server/template/commits/dev) [![coverage report](https://git.redmic.net/redmic-server/template/badges/dev/coverage.svg)](https://git.redmic.net/redmic-server/template/commits/dev)
		# Template

		\| Metrics \| Master \| Develop \|
		\|:-:\|:-:\|:-:\|
		\| CI status \| [![pipeline status](https://gitlab.com/redmic-project/server/template/badges/master/pipeline.svg)](https://gitlab.com/redmic-project/server/template/commits/master) \| [![pipeline status](https://gitlab.com/redmic-project/server/template/badges/dev/pipeline.svg)](https://gitlab.com/redmic-project/server/template/commits/dev) \|
		\| Test coverage \| [![coverage report](https://gitlab.com/redmic-project/server/template/badges/master/coverage.svg)](https://gitlab.com/redmic-project/server/template/commits/master) \| [![coverage report](https://gitlab.com/redmic-project/server/template/badges/dev/coverage.svg)](https://gitlab.com/redmic-project/server/template/commits/dev) \|

		Este proyecto sirve de guía para la creación de un nuevo microservicio.

		@@ -10,10 +15,12 @@ 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 `Dockerfile`, `docker-compose.*.yml` y `src/main/resources/application.properties`.
		4. Modificar el puerto del microservicio, reemplazando `port` en los ficheros `.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`).

		6. En los ficheros `docker-compose.*.yml`, revisar las redes a las que pertenecerá, la memoria asignada a la pila de Java, etc.
		6. En los ficheros `docker-compose.*.yml`, revisar las redes a las que pertenecerá, la memoria asignada a la pila de Java, añadir volúmenes, etc.

		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.