edit ci

.gitlab-ci.yml

@@ -11,23 +11,28 @@ docker-build-push:
     - docker:dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-  # Default branch leaves tag empty (= latest tag)
-  # All other branches are tagged with the escaped branch name (commit ref slug)
   script:
-    - |
+    - docker build --pull -t "$CI_REGISTRY_IMAGE" .
-      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+    - docker push "$CI_REGISTRY_IMAGE"
-        tag=""
-        echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
-      else
-        tag=":$CI_COMMIT_REF_SLUG"
-        echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
-      fi
-    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
-    - docker push "$CI_REGISTRY_IMAGE${tag}"
   allow_failure: false
   only:
     - master
+
+docker-build-push-dev:
+  # Use the official docker image.
+  image: docker:latest
+  stage: build
+  services:
+    - docker:dind
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:dev" .
+    - docker push "$CI_REGISTRY_IMAGE:dev"
+  allow_failure: false
+  only:
     - dev
+    - merge_requests
 
 docker-build:
   image: docker:latest
@@ -42,6 +47,7 @@ docker-build:
   except:
     - master
     - dev
+    - merge_requests
 
 include:
   - template: Security/Container-Scanning.gitlab-ci.yml
@@ -52,6 +58,22 @@ container_scanning:
   stage: test
   allow_failure: false
   
+deploy_dev:
+  stage: deploy
+  image: debian
+  before_script:
+    - apt-get update -qq
+    - 'which ssh-agent || ( apt-get install -qq openssh-client )'
+    - eval $(ssh-agent -s) 
+    - ssh-add <(echo "$SSH_PRIVATE_KEY")
+    - mkdir -p ~/.ssh
+    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+  script:
+    - ssh $SSH_SERVER "cd /root && docker-compose -f shbot-dev.yaml pull shbot-dev && docker-compose -f shbot-dev.yaml up -d shbot-dev && exit"
+  only:
+    - dev
+    - merge_requests
+
 deploy_staging:
   stage: deploy
   image: debian