Merge branch 'dev' of gitlab.com:redmic-project/server/api into dev (27623b43) · Commits · REDMIC Project / Server / API

.gitlab-ci.yml

+81 −34

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ 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
		@@ -20,8 +20,6 @@ maven-build:
		ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}
		only:
		- branches
		except:
		- master
		cache:
		paths:
		- .m2/repository/
		@@ -32,16 +30,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:
		@@ -50,12 +50,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:
		@@ -64,10 +84,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:
		@@ -77,8 +97,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,29 +107,40 @@ 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}
		STACK: api
		SERVICES_TO_CHECK: api_${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
		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}
		AWS_ACCESS_KEY: ${DEV_AWS_ACCESS_KEY}
		AWS_SECRET_KEY: ${DEV_AWS_SECRET_KEY}
		ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}
		services:
		- docker:dind
		script:
		- >
		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} AWS_ACCESS_KEY=${DEV_AWS_ACCESS_KEY}
		AWS_SECRET_KEY=${DEV_AWS_SECRET_KEY} ELASTIC_XPACKSECURITYUSER=${DEV_ELASTIC_XPACKSECURITYUSER}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}
		SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} AWS_ACCESS_KEY=${AWS_ACCESS_KEY} AWS_SECRET_KEY=${AWS_SECRET_KEY}
		ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}
		@@ -120,23 +149,32 @@ 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}
		STACK: api
		SERVICES_TO_CHECK: api_${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
		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}
		AWS_ACCESS_KEY: ${DEV_AWS_ACCESS_KEY}
		AWS_SECRET_KEY: ${DEV_AWS_SECRET_KEY}
		ELASTIC_XPACKSECURITYUSER: ${DEV_ELASTIC_XPACKSECURITYUSER}
		services:
		- docker:dind
		script:
		- >
		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} AWS_ACCESS_KEY=${DEV_AWS_ACCESS_KEY}
		AWS_SECRET_KEY=${DEV_AWS_SECRET_KEY} ELASTIC_XPACKSECURITYUSER=${DEV_ELASTIC_XPACKSECURITYUSER}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}
		SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} AWS_ACCESS_KEY=${AWS_ACCESS_KEY} AWS_SECRET_KEY=${AWS_SECRET_KEY}
		ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}
		environment:
		name: dev
		url: https://appdev.${DEV_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}
		@@ -149,26 +187,35 @@ 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}
		STACK: api
		SERVICES_TO_CHECK: api_${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
		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}
		AWS_ACCESS_KEY: ${PRO_AWS_ACCESS_KEY}
		AWS_SECRET_KEY: ${PRO_AWS_SECRET_KEY}
		ELASTIC_XPACKSECURITYUSER: ${PRO_ELASTIC_XPACKSECURITYUSER}
		services:
		- docker:dind
		script:
		- >
		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} AWS_ACCESS_KEY=${PRO_AWS_ACCESS_KEY}
		AWS_SECRET_KEY=${PRO_AWS_SECRET_KEY} ELASTIC_XPACKSECURITYUSER=${PRO_ELASTIC_XPACKSECURITYUSER}
		SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}
		SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}
		OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} AWS_ACCESS_KEY=${AWS_ACCESS_KEY} AWS_SECRET_KEY=${AWS_SECRET_KEY}
		ELASTIC_XPACKSECURITYUSER=${ELASTIC_XPACKSECURITYUSER}
		environment:
		name: pro
		url: https://${PRO_PUBLIC_HOSTNAME}/${CI_PROJECT_NAME}
		only:
		- tags
		- master
		when: manual

Dockerfile

+4 −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 ${MICROSERVICE_PORT}

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

.env→deploy/.env

+0 −0

File moved.

View file

deploy/docker-compose.dev.yml

0 → 100644

+32 −0

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

		services:
		api:
		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:/${MICROSERVICE_NAME}
		traefik.backend: ${MICROSERVICE_NAME}
		restart_policy:
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '1'
		memory: 1G
		reservations:
		memory: 820M

		volumes:
		mediastorage-private-vol:
		name: mediastorage-private-vol

		mediastorage-public-vol:
		name: mediastorage-public-vol

docker-compose.prod.yml→deploy/docker-compose.prod.yml

+13 −8

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

		services:
		api:
		networks:
		- traefik-net
		deploy:
		mode: replicated
		replicas: 1
		@@ -16,17 +14,24 @@ services:
		constraints:
		- node.role == worker
		restart_policy:
		condition: on-failure
		max_attempts: 3

		networks:
		traefik-net:
		external: true
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '1'
		memory: 1G
		reservations:
		memory: 820M

		volumes:
		mediastorage-private-vol:
		name: mediastorage-private-vol
		driver: "cloudstor:aws"
		driver_opts:
		backing: shared

		mediastorage-public-vol:
		name: mediastorage-public-vol
		driver: "cloudstor:aws"
		driver_opts:
		backing: shared