image build refactoring

.gitlab-ci.yml

@@ -6,6 +6,9 @@ before_script:
   - apk add git
   - git clone https://baltig.infn.it/mw-devel/helper-scripts.git helper-scripts
   - cp helper-scripts/scripts/* /usr/local/bin
+  - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
+  - export DOCKER_REGISTRY_HOST=${CI_REGISTRY}
+  - export DOCKER_REGISTRY_NAMESPACE=${CI_PROJECT_PATH}
 
 stages:
   - build
@@ -14,6 +17,15 @@ stages:
 build:
   stage: build
   script:
-    - export DOCKER_REGISTRY_HOST=${CI_REGISTRY}
-    - export DOCKER_REGISTRY_NAMESPACE=${CI_PROJECT_PATH}
-    - cd docker &&  S2_IMAGES=base sh push-images.sh
+    - env | sort
+    - cd docker && sh build-images.sh && sh push-images.sh
+
+push-to-dockerhub:
+  stage: dockerhub
+  script:
+    - export DOCKER_PUSH_TO_DOCKERHUB=y
+    - env | sort
+    - cd docker && sh pull-images.sh && unset DOCKER_REGISTRY_HOST && sh push-images.sh
+  only:
+      - master
+