diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9de703bd97b5fe5b53a19a02eccc8915bd64b0bf..ff896d4ada873265e5a7182f260ddebfcc220692 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,43 +1,43 @@ variables: - DOCKER_HOST: "tcp://docker-dind.gitlab-suma:2375" - BUILD_DOCKER_IMAGE: docker:20.10.15 - DEPLOY_KUBERNETES_IMAGE: alpine/k8s:1.22.6 - DOCKER_FPM_IMAGE_NAME: fpm - DOCKER_NGINX_IMAGE_NAME: nginx - DOCKER_NODE_IMAGE_NAME: node + DOCKER_HOST: "tcp://docker-dind.gitlab-suma:2375" + BUILD_DOCKER_IMAGE: docker:20.10.15 + DEPLOY_KUBERNETES_IMAGE: alpine/k8s:1.22.6 + DOCKER_FPM_IMAGE_NAME: fpm + DOCKER_NGINX_IMAGE_NAME: nginx + DOCKER_NODE_IMAGE_NAME: node workflow: rules: - - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "development" && ($CI_COMMIT_TAG || $CI_COMMIT_BRANCH) - variables: - APP_URL: "https://${DOCKER_IMAGE_TAG_PREFIX}.review.metager.de" - APP_ENV: development - DOCKER_IMAGE_TAG_PREFIX: $CI_COMMIT_REF_SLUG - DOCKER_COMPOSER_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-composer-$CI_COMMIT_SHA - DOCKER_FPM_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA - DOCKER_NGINX_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA - DOCKER_NODE_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA - HELM_RELEASE_NAME: review-$DOCKER_IMAGE_TAG_PREFIX - - if: $CI_COMMIT_BRANCH == "master" - variables: - APP_URL: https://metager.de - APP_ENV: production - DOCKER_IMAGE_TAG_PREFIX: $CI_COMMIT_BRANCH - DOCKER_COMPOSER_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-composer-$CI_COMMIT_SHA - DOCKER_FPM_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA - DOCKER_NGINX_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA - DOCKER_NODE_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA - HELM_RELEASE_NAME: $DOCKER_IMAGE_TAG_PREFIX - - if: $CI_COMMIT_BRANCH == "development" - variables: - APP_URL: https://metager3.de - APP_ENV: development - DOCKER_IMAGE_TAG_PREFIX: $CI_COMMIT_BRANCH - DOCKER_COMPOSER_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-composer-$CI_COMMIT_SHA - DOCKER_FPM_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA - DOCKER_NGINX_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA - DOCKER_NODE_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA - HELM_RELEASE_NAME: $DOCKER_IMAGE_TAG_PREFIX + - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "development" && ($CI_COMMIT_TAG || $CI_COMMIT_BRANCH) + variables: + APP_URL: "https://${DOCKER_IMAGE_TAG_PREFIX}.review.metager.de" + APP_ENV: development + DOCKER_IMAGE_TAG_PREFIX: $CI_COMMIT_REF_SLUG + DOCKER_COMPOSER_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-composer-$CI_COMMIT_SHA + DOCKER_FPM_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA + DOCKER_NGINX_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA + DOCKER_NODE_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA + HELM_RELEASE_NAME: review-${DOCKER_IMAGE_TAG_PREFIX:0:46} + - if: $CI_COMMIT_BRANCH == "master" + variables: + APP_URL: https://metager.de + APP_ENV: production + DOCKER_IMAGE_TAG_PREFIX: $CI_COMMIT_BRANCH + DOCKER_COMPOSER_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-composer-$CI_COMMIT_SHA + DOCKER_FPM_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA + DOCKER_NGINX_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA + DOCKER_NODE_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA + HELM_RELEASE_NAME: ${DOCKER_IMAGE_TAG_PREFIX:0:53} + - if: $CI_COMMIT_BRANCH == "development" + variables: + APP_URL: https://metager3.de + APP_ENV: development + DOCKER_IMAGE_TAG_PREFIX: $CI_COMMIT_BRANCH + DOCKER_COMPOSER_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-composer-$CI_COMMIT_SHA + DOCKER_FPM_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA + DOCKER_NGINX_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA + DOCKER_NODE_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA + HELM_RELEASE_NAME: ${DOCKER_IMAGE_TAG_PREFIX:0:53} stages: - build_dependency_images @@ -51,4 +51,4 @@ include: - local: /.gitlab/ci/build_dependencies.yml - local: /.gitlab/ci/build_docker_images.yml - local: /.gitlab/ci/deploy.yml - - local: /.gitlab/ci/integrationtest.yml \ No newline at end of file + - local: /.gitlab/ci/integrationtest.yml diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 3e47108b115e2cfef75d4d6ce142478a03e90b0e..5d7a80b422fea357cb573a1ecc9a9ca494b9da7d 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -2,7 +2,7 @@ Expand the name of the chart. */}} {{- define "chart.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 53 | trimSuffix "-" }} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} {{- end }} {{/* @@ -12,9 +12,9 @@ If release name contains chart name it will be used as a full name. */}} {{- define "chart.fullname" -}} {{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 53 | trimSuffix "-" }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} {{- else }} -{{- .Release.Name | trunc 53 | trimSuffix "-" }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} {{- end }} {{- end }} @@ -22,7 +22,7 @@ If release name contains chart name it will be used as a full name. Create chart name and version as used by the chart label. */}} {{- define "chart.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 53 | trimSuffix "-" }} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/*