Merge branch 'master' into feature/publish_cat_id_to_mongo

.gitlab-ci.yml

@@ -38,11 +38,13 @@ package:
   services:
     - docker:dind
   before_script:
+    - version=`cat version`
+    - echo $version
     - docker info
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_TOKEN $CI_REGISTRY
   script:
-    - docker build -t $CI_REGISTRY/$CI_REGISTRY_IMAGE:$CI_REGISTRY_IMAGE_TAG .
-    - docker push $CI_REGISTRY/$CI_REGISTRY_IMAGE:$CI_REGISTRY_IMAGE_TAG
+    - docker build -t $CI_REGISTRY/$CI_REGISTRY_IMAGE:$version -t $CI_REGISTRY/$CI_REGISTRY_IMAGE:$CI_REGISTRY_IMAGE_TAG .
+    - docker push --all-tags $CI_REGISTRY/$CI_REGISTRY_IMAGE
   tags:
     - kubernetes
     - smart-harvester
@@ -56,7 +58,8 @@ deploy:
     - mkdir .kube/
     - echo -n $KUBE_CONFIG | base64 -d > .kube/config
   script:
-    - kubectl --kubeconfig .kube/config --namespace $KUBE_NAMESPACE set image deployment/$KUBE_DEPLOYMENT $KUBE_CONTAINER=$CI_REGISTRY/$CI_REGISTRY_IMAGE:$CI_REGISTRY_IMAGE_TAG
+    # - kubectl --kubeconfig .kube/config --namespace $KUBE_NAMESPACE set image deployment/$KUBE_DEPLOYMENT $KUBE_CONTAINER=$CI_REGISTRY/$CI_REGISTRY_IMAGE:$CI_REGISTRY_IMAGE_TAG
+    - kubectl --kubeconfig .kube/config --namespace $KUBE_NAMESPACE rollout restart deployment/$KUBE_DEPLOYMENT
   tags:
     - kubernetes
     - smart-harvester

Dockerfile

-FROM openjdk:8-jdk-alpine
+FROM openjdk:11-jdk-slim
 ARG JAR_FILE=target/*.jar
 COPY ${JAR_FILE} app.jar
-ENTRYPOINT ["java","-jar","/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-jar","/app.jar"]

version

+v3
\ No newline at end of file