Merge branch 'fix-docker-in-ci' into 'master'

Fix docker in ci

See merge request fablab/labsync!50

.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

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)

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