Omite creación de imagen propia (ba07e97e) · Commits · REDMIC Project / Metric / Prometheus

.dockerignore

deleted100644 → 0

+0 −2

Original line number	Diff line number	Diff line
		*
		!conf

.gitlab-ci.yml

+2 −48

Original line number	Diff line number	Diff line
		stages:
		- test
		- package
		- test-package
		- deploy

		services:
		@@ -11,8 +9,8 @@ variables:
		DOCKER_DRIVER: overlay2
		STACK: metric
		SERVICES_TO_CHECK: metric_prometheus
		IMAGE_NAME: ${CI_REGISTRY_IMAGE}
		IMAGE_TAG: ${CI_COMMIT_SHA}
		IMAGE_NAME: prom/prometheus
		IMAGE_TAG: v2.8.0

		check-rules:
		stage: test
		@@ -20,50 +18,6 @@ check-rules:
		script:
		- ./check-rules.sh

		docker-build-commit-non-master-branches:
		stage: package
		image: docker:stable
		only:
		- branches
		except:
		- 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 push ${CI_REGISTRY_IMAGE}

		docker-build-commit-master-branch:
		stage: package
		image: docker:stable
		only:
		- 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}:latest .
		- docker push ${CI_REGISTRY_IMAGE}

		container-scanning:
		stage: test-package
		image: docker:stable
		allow_failure: true
		only:
		- branches
		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
		- apk add -U wget ca-certificates
		- docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
		- docker pull ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}
		- wget https://github.com/arminc/clair-scanner/releases/download/v8/clair-scanner_linux_amd64
		- 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
		artifacts:
		paths: [gl-sast-container-report.json]

		deploy-supporting-branch-develop:
		stage: deploy
		image: ${DOCKER_DEPLOY_IMAGE_NAME}:${DOCKER_DEPLOY_IMAGE_TAG}

Dockerfile

deleted100644 → 0

+0 −5

Original line number	Diff line number	Diff line
		FROM prom/prometheus:v2.8.0

		COPY conf /etc/prometheus/

		ENTRYPOINT [ "/etc/prometheus/docker-entrypoint.sh" ]

conf/docker-entrypoint.sh→deploy/conf/entrypoint.sh

+0 −0

File moved.

View file

conf/prometheus.yml→deploy/conf/prometheus.yml

+0 −0

File moved.

View file