updated ci and build scripts

.gitlab-ci.yml

@@ -7,6 +7,7 @@ before_script:
   
 stages:
   - lint
+  - image
   - upload
 
 flake8:
@@ -48,3 +49,19 @@ pypi-stable:
     - if: '$CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/'
   script:
     - pyb -P version=$CI_COMMIT_TAG publish upload
+
+clojure-image-test-publish:
+  image: domaindrivenarchitecture/devops-build:latest
+  stage: image
+  rules:
+    - if: '$CI_COMMIT_TAG != null'
+  script:
+    - cd infrastructure/clojure && pyb image test publish
+
+devops-build-image-test-publish:
+  image: domaindrivenarchitecture/devops-build:latest
+  stage: image
+  rules:
+    - if: '$CI_COMMIT_TAG != null'
+  script:
+    - cd infrastructure/devops-build && pyb image test publish

infrastructure/clojure/build.py

@@ -16,10 +16,17 @@ class MyBuild(DevopsDockerBuild):
 def initialize(project):
     project.build_depends_on('ddadevops>=0.13.0')
     stage = 'notused'
-    dockerhub_user = gopass_field_from_path('meissa/web/docker.com', 'login')
-    dockerhub_password = gopass_password_from_path('meissa/web/docker.com')
+    dockerhub_user = environ.get('DOCKERHUB_USER')
+    if not dockerhub_user:
+        dockerhub_user = gopass_field_from_path('meissa/web/docker.com', 'login')
+    dockerhub_password = environ.get('DOCKERHUB_PASSWORD')
+    if not dockerhub_password:
+        dockerhub_password = gopass_password_from_path('meissa/web/docker.com')
+    tag = environ.get('CI_COMMIT_TAG')
+    if not tag:
+        tag = get_tag_from_latest_commit()
     config = create_devops_docker_build_config(
-        stage, PROJECT_ROOT_PATH, MODULE, dockerhub_user, dockerhub_password)
+        stage, PROJECT_ROOT_PATH, MODULE, dockerhub_user, dockerhub_password, docker_publish_tag=tag)
     build = MyBuild(project, config)
     build.initialize_build_dir()
 

infrastructure/devops-build/build.py

@@ -16,10 +16,17 @@ class MyBuild(DevopsDockerBuild):
 def initialize(project):
     project.build_depends_on('ddadevops>=0.13.0')
     stage = 'notused'
-    dockerhub_user = gopass_field_from_path('meissa/web/docker.com', 'login')
-    dockerhub_password = gopass_password_from_path('meissa/web/docker.com')
+    dockerhub_user = environ.get('DOCKERHUB_USER')
+    if not dockerhub_user:
+        dockerhub_user = gopass_field_from_path('meissa/web/docker.com', 'login')
+    dockerhub_password = environ.get('DOCKERHUB_PASSWORD')
+    if not dockerhub_password:
+        dockerhub_password = gopass_password_from_path('meissa/web/docker.com')
+    tag = environ.get('CI_COMMIT_TAG')
+    if not tag:
+        tag = get_tag_from_latest_commit()
     config = create_devops_docker_build_config(
-        stage, PROJECT_ROOT_PATH, MODULE, dockerhub_user, dockerhub_password)
+        stage, PROJECT_ROOT_PATH, MODULE, dockerhub_user, dockerhub_password, docker_publish_tag=tag)
     build = MyBuild(project, config)
     build.initialize_build_dir()