From f901aeaefcde9fd9267512d446ca74afea3433be Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Tue, 29 Aug 2023 23:54:47 +0200 Subject: [PATCH] [SIS-xxx] renaming sissi run image --- Tiltfile | 6 +++--- deployment/helm/sissi/Chart.yaml | 4 ++-- deployment/helm/sissi/values.yaml | 8 ++++---- deployment/image-packaging/src/main/docker/.env | 2 +- .../image-packaging/src/main/docker/docker-compose.yml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Tiltfile b/Tiltfile index a41f354e..7f9123ff 100644 --- a/Tiltfile +++ b/Tiltfile @@ -15,7 +15,7 @@ local_resource( deps=['pom.xml']) docker_build_with_restart( - registry + 'sissi', + registry + 'sissi-bot', './application/executable/target/jar', entrypoint=['java', '-noverify', '-cp', '.:./lib/*', 'dev.sheldan.sissi.executable.Application'], dockerfile='./application/executable/Dockerfile', @@ -32,6 +32,6 @@ docker_build(registry + 'sissi-template-data', 'deployment/image-packaging/src/m k8s_yaml(helm('deployment/helm/sissi', values= -['./../Sissi-environments/values/local/values.yaml', -'secrets://./../Sissi-environments/values/local/values.secrets.yaml'] +['./../Sissi-environments/argocd/apps/sissi/values/local/values.yaml', +'secrets://./../Sissi-environments/argocd/apps/sissi/values/local/values.secrets.yaml'] )) \ No newline at end of file diff --git a/deployment/helm/sissi/Chart.yaml b/deployment/helm/sissi/Chart.yaml index bbc436ff..de27b7ad 100644 --- a/deployment/helm/sissi/Chart.yaml +++ b/deployment/helm/sissi/Chart.yaml @@ -15,10 +15,10 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.7 +version: 1.4.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.4.7" +appVersion: "1.4.8" diff --git a/deployment/helm/sissi/values.yaml b/deployment/helm/sissi/values.yaml index 299f426b..3c4ca8b9 100644 --- a/deployment/helm/sissi/values.yaml +++ b/deployment/helm/sissi/values.yaml @@ -7,8 +7,8 @@ replicaCount: 1 bot: repository: harbor.sheldan.dev/sissi pullPolicy: IfNotPresent - image: sissi - tag: 1.4.7 + image: sissi-bot + tag: 1.4.8 templateDeployment: enabled: true @@ -21,7 +21,7 @@ templateDeploymentData: repository: harbor.sheldan.dev/sissi pullPolicy: Always image: sissi-template-data - tag: 1.4.7 + tag: 1.4.8 dbConfigDeployment: enabled: true @@ -34,7 +34,7 @@ dbConfigDeploymentData: repository: harbor.sheldan.dev/sissi pullPolicy: Always image: sissi-db-data - tag: 1.4.7 + tag: 1.4.8 dbCredentials: host: diff --git a/deployment/image-packaging/src/main/docker/.env b/deployment/image-packaging/src/main/docker/.env index 2d3b57dd..6ebf6659 100644 --- a/deployment/image-packaging/src/main/docker/.env +++ b/deployment/image-packaging/src/main/docker/.env @@ -1,2 +1,2 @@ REGISTRY_PREFIX=harbor.sheldan.dev/sissi/ -VERSION=1.4.7 \ No newline at end of file +VERSION=1.4.8 \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/docker-compose.yml b/deployment/image-packaging/src/main/docker/docker-compose.yml index 982454bf..adf74b1e 100644 --- a/deployment/image-packaging/src/main/docker/docker-compose.yml +++ b/deployment/image-packaging/src/main/docker/docker-compose.yml @@ -4,7 +4,7 @@ services: bot: build: context: sissi - image: ${REGISTRY_PREFIX}sissi:${VERSION:-latest} + image: ${REGISTRY_PREFIX}sissi-bot:${VERSION:-latest} db-data: build: context: db-data