fix sed/gsed issue; make the branch name the (released) container version

.gitlab-ci.yml

@@ -11,15 +11,12 @@ stages:
 variables:
   DOCKER_DRIVER: overlay2
   CONTAINER_IMAGE: lab.compute.dtu.dk:5005/$CI_PROJECT_PATH
-  CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
-  CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
+  CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:CI_COMMIT_SHORT_SHA
+  CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   GIT_SUBMODULE_STRATEGY: recursive
 
-
 test:
   image: $CONTAINER_TEST_IMAGE
-#    name: $CONTAINER_TEST_IMAGE
-#    entrypoint: ["/bin/bash"]
   services:
   - name: lab.compute.dtu.dk:5005/enote/dtu-enote-mongodb
     alias: quiz-db
@@ -64,21 +61,39 @@ deploy_devel:
   - deploy-devel
   stage: deploy
   script:
-  - echo "Deploy to development server"
+  - echo "Deploy to ${CI_BUILD_REF_SLUG} server"
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
   - cd /enote/src/dtu-enote
-  - echo docker stop course_website
   - ../../gen/docker-stop.sh
   - docker-compose -f ../../gen/docker-compose-enote.yml pull
+  - docker images | grep ${CI_PROJECT_PATH}
   - ../../gen/docker-start.sh
   - docker ps -q -f status=exited | xargs -I '{}' docker rm -f '{}'
   - docker ps -q -f status=dead | xargs -I '{}' docker rm -f '{}'
-  - echo docker pull $CONTAINER_RELEASE_IMAGE
-  - docker images | grep ${CI_PROJECT_PATH}
-  - echo bundle exec rake deploy:redeploy[dtu-quiz]
   - docker image prune -f
   environment:
     name: develop
     url: https://enote-devel3.compute.dtu.dk
   only:
   - develop
+
+deploy_production:
+  tags:
+  - deploy-production
+  stage: deploy
+  script:
+  - echo "Deploy to ${CI_BUILD_REF_SLUG} server"
+  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+  - cd /enote/src/dtu-enote
+  - ../../gen/docker-stop.sh
+  - docker-compose -f ../../gen/docker-compose-enote.yml pull
+  - docker images | grep ${CI_PROJECT_PATH}
+  - ../../gen/docker-start.sh
+  - docker ps -q -f status=exited | xargs -I '{}' docker rm -f '{}'
+  - docker ps -q -f status=dead | xargs -I '{}' docker rm -f '{}'
+  - docker image prune -f
+  environment:
+    name: production
+    url: https://quiz.compute.dtu.dk
+  only:
+  - master

scripts/gen-build-info.sh

@@ -49,7 +49,11 @@ function emit_info() {
   done
 }
 
-component=$(git config --local remote.origin.url | gsed -r 's/.*[:/]([^/]+)(\.git)?$/\1/' | gsed -r 's/\//-/')
+sed=sed
+if type gsed >/dev/null 2>&1; then
+  sed=gsed
+fi
+component=$(git config --local remote.origin.url | ${sed} -r 's/.*[:/]([^/]+)(\.git)?$/\1/' | ${sed} -r 's/\//-/')
 
 emit_info ${component} .