EOX GitLab Instance

Commit 20c07805 authored by Nikola Jankovic's avatar Nikola Jankovic 💻
Browse files

added tagging info to readme

updated cicd deploy->publish
updated cicd helm on tags
separated ingress from global
parent 034e0357
stages:
- deploy
- publish
- chart
variables:
DOCKER_TLS_CERTDIR: ""
deploy_latest:
publish_latest:
image: docker:20.10.8
services:
- docker:20.10.8-dind
stage: deploy
stage: publish
script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
- docker build -t $CI_REGISTRY_IMAGE .
......@@ -17,11 +17,11 @@ deploy_latest:
only:
- main
deploy:
publish:
image: docker:20.10.8
services:
- docker:20.10.8-dind
stage: deploy
stage: publish
script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
- docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG .
......@@ -38,4 +38,3 @@ helm:
- curl -u $HELM_CHART_REPOSITORY_CREDENTIALS -v -X POST https://charts-public.hub.eox.at/api/charts --data-binary "@${upload_filename}"
only:
- tags
- main
# Client
The client service of the view server
## Tagging
**Before tagging remember to increment the chart version (`.chart/Chart.yaml`) manually!**
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "vs-client.fullname" . -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
......@@ -48,3 +49,4 @@ spec:
servicePort: http
{{- end -}}
{{- end }}
{{- end -}}
......@@ -51,6 +51,9 @@ livenessProbe:
successThreshold: 1
timeoutSeconds: 1
ingress:
enabled: true
global:
metadata:
title: PRISM Data Access Service developed by EOX
......@@ -58,7 +61,6 @@ global:
layers: []
overlayLayers: []
ingress:
enabled: true
annotations:
kubernetes.io/ingress.class: nginx
kubernetes.io/tls-acme: "true"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment