Merge branch 'dev' into 'master' (3f9ce049) · Commits · REDMIC Project / Server / AIS

.gitlab-ci.yml

+6 −6

Original line number	Diff line number	Diff line
		include:
		- project: 'redmic-project/gitlab-ci-templates'
		ref: master
		file: '/maven-building-microservice.yml'
		file: '/building/maven/microservice.yml'
		- project: 'redmic-project/gitlab-ci-templates'
		ref: master
		file: '/license-listing.yml'
		file: '/scanning/dependency-scanning.yml'
		- project: 'redmic-project/gitlab-ci-templates'
		ref: master
		file: '/packaging.yml'
		file: '/packaging-docker/docker-build.yml'
		- project: 'redmic-project/gitlab-ci-templates'
		ref: master
		file: '/deployment.yml'
		file: '/deployment-service/docker-deploy.yml'
		- project: 'redmic-project/gitlab-ci-templates'
		ref: master
		file: '/deployment-custom-image.yml'
		file: '/deployment-service/custom-image.yml'

		stages:
		- build
		- license-list
		- test
		- pre-package
		- package
		- post-package

deleted100644 → 0

+0 −14

Original line number	Diff line number	Diff line
		ARG PARENT_IMAGE_NAME=registry.gitlab.com/redmic-project/docker/redmic-server
		ARG PARENT_IMAGE_TAG=latest

		FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}

		COPY /dist/*.jar ./

		ARG MICROSERVICE_NAME=ais
		ENV MICROSERVICE_NAME=${MICROSERVICE_NAME}

		ARG MICROSERVICE_PORT=8090
		ENV MICROSERVICE_PORT=${MICROSERVICE_PORT}

		EXPOSE ${MICROSERVICE_PORT}

0 → 100644

+4 −0

Original line number	Diff line number	Diff line
		PARENT_IMAGE_NAME=registry.gitlab.com/redmic-project/docker/redmic-server
		PARENT_IMAGE_TAG=latest
		MICROSERVICE_NAME=ais
		MICROSERVICE_PORT=8090

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		ARG PARENT_IMAGE_NAME \
		PARENT_IMAGE_TAG

		FROM ${PARENT_IMAGE_NAME}:${PARENT_IMAGE_TAG}

		ARG MICROSERVICE_NAME \
		MICROSERVICE_PORT

		ENV MICROSERVICE_NAME=${MICROSERVICE_NAME} \
		MICROSERVICE_PORT=${MICROSERVICE_PORT}

		EXPOSE ${MICROSERVICE_PORT}

		COPY /dist/*.jar ./

+0 −0

File moved.