diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5805d751b43a3f155724f3938729660a7545efeb..c906e747b4d84c841eaa7cda6fa86f3ef9c21d47 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ variables: DOCKER_FPM_IMAGE_NAME: fpm DOCKER_NGINX_IMAGE_NAME: nginx DOCKER_NODE_IMAGE_NAME: node + DOCKER_REDIS_IMAGE_NAME: redis KUBE_NAMESPACE: metager-2 workflow: @@ -18,6 +19,7 @@ workflow: 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 + DOCKER_REDIS_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA HELM_RELEASE_NAME: review-$DOCKER_IMAGE_TAG_PREFIX - if: $CI_COMMIT_BRANCH == "master" variables: @@ -28,6 +30,7 @@ workflow: 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 + DOCKER_REDIS_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA HELM_RELEASE_NAME: $DOCKER_IMAGE_TAG_PREFIX - if: $CI_COMMIT_BRANCH == "development" variables: @@ -38,6 +41,7 @@ workflow: 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 + DOCKER_REDIS_IMAGE_TAG: $DOCKER_IMAGE_TAG_PREFIX-$CI_COMMIT_SHA HELM_RELEASE_NAME: $DOCKER_IMAGE_TAG_PREFIX stages: diff --git a/.gitlab/ci/build_docker_images.yml b/.gitlab/ci/build_docker_images.yml index 2822c17080369b5995b51f1ef858782c572a5ef0..3a197d01d40b75191e3f1b9067c8b9f4df78a7e4 100644 --- a/.gitlab/ci/build_docker_images.yml +++ b/.gitlab/ci/build_docker_images.yml @@ -33,6 +33,19 @@ nginx: after_script: - docker logout $CI_REGISTRY +redis: + stage: build_docker_images + image: $BUILD_DOCKER_IMAGE + before_script: + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + script: + - cd build/redis + - docker build --network=host + -t ${CI_REGISTRY_IMAGE}/$DOCKER_REDIS_IMAGE_NAME:$DOCKER_REDIS_IMAGE_TAG . + - docker push ${CI_REGISTRY_IMAGE}/$DOCKER_REDIS_IMAGE_NAME:$DOCKER_REDIS_IMAGE_TAG + after_script: + - docker logout $CI_REGISTRY + .cleanup_revision_images: stage: build_docker_images image: $DEPLOY_KUBERNETES_IMAGE diff --git a/.gitlab/deployment_scripts/update_deployment.sh b/.gitlab/deployment_scripts/update_deployment.sh index 6306a8a9482586075d69da616b454bdcd3ed37e9..ed2e7ea0db842c351d8468dc7035e40bbd0af917 100755 --- a/.gitlab/deployment_scripts/update_deployment.sh +++ b/.gitlab/deployment_scripts/update_deployment.sh @@ -11,5 +11,6 @@ helm -n $KUBE_NAMESPACE upgrade --install \ --set ingress.hosts[0].host="$DEPLOYMENT_URL" \ --set image.fpm.tag=$DOCKER_FPM_IMAGE_TAG \ --set image.nginx.tag=$DOCKER_NGINX_IMAGE_TAG \ + --set image.redis.tag=$DOCKER_REDIS_IMAGE_TAG \ --set app_url=$APP_URL \ --wait \ No newline at end of file diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index b4f90d2fa02f227827d75b834e4f478a7a9e9e89..eec90ff169862662cba4f4456502b898f30b6ff5 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -73,6 +73,14 @@ Create the name of the service account to use {{- end -}} {{- end -}} +{{- define "redis_image" -}} +{{- if eq .Values.image.redis.tag "" -}} +{{- .Values.image.redis.repository -}} +{{- else -}} +{{- printf "%s:%s" .Values.image.redis.repository .Values.image.redis.tag -}} +{{- end -}} +{{- end -}} + {{- define "secret_name" -}} {{- printf "%s" .Release.Name }} {{- end -}} \ No newline at end of file diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 61de6a02edda910acff0e0c8e8233f84b9c2877e..dcce87299a03fe51f3579d1d4ca9756ef2e55bf5 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -214,7 +214,7 @@ spec: memory: 100M limits: - name: redis - image: "redis:6" + image: "{{ template "redis_image" . }}" imagePullPolicy: {{ .Values.image.pullPolicy }} command: ["redis-server", "/usr/local/etc/redis/redis.conf"] volumeMounts: diff --git a/chart/values.yaml b/chart/values.yaml index de98d5308ee5e61b46bed8968853f14d0c4456de..485d2b8718cc3ee9afb5bee4f8c86e2a63f3c132 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -16,6 +16,11 @@ image: pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "" + redis: + repository: registry.metager.de/open-source/metager/redis + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" imagePullSecrets: [] nameOverride: ""