diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fae956719aec44874c2953b1ffe98e268955b4fd..ee49dc294e7fdbc1878ea4c93a9ee6a00373dbdd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,16 +15,16 @@ workflow: APP_ENV: development APP_URL: "https://${CI_COMMIT_REF_SLUG}.review.metager.de" - if: $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "development" - variables: - DOCKER_COMPOSER_IMAGE_TAG: $CI_COMMIT_BRANCH-composer-$CI_COMMIT_SHA - DOCKER_FPM_IMAGE_TAG: $CI_COMMIT_BRANCH-$CI_COMMIT_SHA - DOCKER_NGINX_IMAGE_TAG: $CI_COMMIT_BRANCH-$CI_COMMIT_SHA + variables: + DOCKER_COMPOSER_IMAGE_TAG: $CI_COMMIT_BRANCH-composer-$CI_COMMIT_SHA + DOCKER_FPM_IMAGE_TAG: $CI_COMMIT_BRANCH-$CI_COMMIT_SHA + DOCKER_NGINX_IMAGE_TAG: $CI_COMMIT_BRANCH-$CI_COMMIT_SHA - if: $CI_COMMIT_BRANCH == "master" - variables: - APP_URL: https://metager.de + variables: + APP_URL: https://metager.de - if: $CI_COMMIT_BRANCH == "development" - variables: - APP_URL: https://metager3.de + variables: + APP_URL: https://metager3.de stages: - build_composer