From 0a6d9ee69e9b7f0187e829cce966bc0a3800736a Mon Sep 17 00:00:00 2001 From: jalr Date: Thu, 15 Aug 2019 22:19:58 +0200 Subject: [PATCH 1/3] Disable TLS for Docker --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 97e4d49..21dbccb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ variables: WEBSEED: http://labsync.lab.fablab-nea.de/labsync/$CI_COMMIT_REF_NAME/$CI_PIPELINE_ID/images DOCKER_IMAGE_BUILDER: ${CI_REGISTRY_IMAGE}/labsync-builder:$CI_COMMIT_REF_SLUG DOCKER_IMAGE_SECURITY_SCANNER: ${CI_REGISTRY_IMAGE}/security-scanner:$CI_COMMIT_REF_SLUG + DOCKER_TLS_CERTDIR: "" stages: - prepare From 20202f12fa8f25e628684c0f48d31b2612155651 Mon Sep 17 00:00:00 2001 From: jalr Date: Thu, 15 Aug 2019 22:49:04 +0200 Subject: [PATCH 2/3] Tag local images with branch name per default --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 497fc3f..c6b559e 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ PACKER_VERSION ?= 1.3.5 ANNOUNCE ?= http://10.2.2.1:6969/announce WEBSEED ?= http://10.2.2.1 -CI_COMMIT_REF_SLUG ?= master +CI_COMMIT_REF_SLUG ?= $(shell git name-rev --name-only HEAD) DOCKER_IMAGE_BUILDER ?= labsync-builder:$(CI_COMMIT_REF_SLUG) DOCKER_IMAGE_SECURITY_SCANNER ?= security-scanner:$(CI_COMMIT_REF_SLUG) From 5b51b2d742a8e11f1d2ea0397ebdad52650631c7 Mon Sep 17 00:00:00 2001 From: jalr Date: Thu, 15 Aug 2019 22:49:43 +0200 Subject: [PATCH 3/3] Use generator instead of pagination --- security-scanner/security_scanner/gitlab.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/security-scanner/security_scanner/gitlab.py b/security-scanner/security_scanner/gitlab.py index a4e5fc8..a7f37d3 100644 --- a/security-scanner/security_scanner/gitlab.py +++ b/security-scanner/security_scanner/gitlab.py @@ -15,12 +15,11 @@ class GitLab: self._project = self._gl.projects.get(project_id) def getLastSuccessfulJob(self, ref, name): - pipelines = self._project.pipelines.list(ref=ref, status='success') + pipelines = self._project.pipelines.list(ref=ref, status='success', as_list=False) last_successful_job = None - print(pipelines) for pipeline in pipelines: - jobs = pipeline.jobs.list(scope='success') + jobs = pipeline.jobs.list(scope='success', as_list=False) for job in jobs: if job.attributes['name'] == name: return job