diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5917460e6f71579ccfa62aefe6e967c3cacab7ad..6642d334efb97137985a1d1440ad8f69dbd7452c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: - Docker build variables: - CONTAINER_IMAGE: "registry.kszk.bme.hu/monitoring/pupak:$CI_COMMIT_REF_NAME" + CONTAINER_IMAGE: "hub.docker.com:robotka/pupak:$CI_COMMIT_REF_NAME" pip: stage: Get dependencies @@ -33,5 +33,3 @@ docker build: script: - echo "{\"auths\":{\"registry.kszk.bme.hu\":{\"username\":\"$CI_REG_USER\",\"password\":\"$CI_REG_PASS\"}}}" > /kaniko/.docker/services.json - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CONTAINER_IMAGE - only: - - master diff --git a/generator.py b/generator.py index 301c7d48de25f1eb11cb6bb357eaca149e238c4d..ebd59792178bed3623bc2cd25279707889613371 100644 --- a/generator.py +++ b/generator.py @@ -43,12 +43,12 @@ class Generator: stream = os.popen('git -C ' + str(self.data_folder.absolute()) + ' rev-parse HEAD') git_hash = stream.read() stream = os.popen('git -C ' + str(self.data_folder.absolute()) + ' log -1 --pretty=format:"%an"') - git_commiter = stream.read() + git_committer = stream.read() output = "# This file is generated. Some meta:" output += "\n# Time: " + datetime.now().isoformat() output += "\n# Host: " + socket.gethostname() - output += "\n# Data dir commiter: " + git_commiter + output += "\n# Data dir commiter: " + git_committer output += "\n# Data dir commit hash: " + git_hash.replace('\n', '') return output