Skip to content
Snippets Groups Projects
Commit 56cadcfb authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'switching-auto-deploy-image' into 'development'

Switching auto deploy image

See merge request !1732
parents 9c36351b 07a08b3a
No related branches found
No related tags found
2 merge requests!1739Development,!1732Switching auto deploy image
...@@ -33,6 +33,8 @@ stages: ...@@ -33,6 +33,8 @@ stages:
- integrationtest - integrationtest
- cleanup - cleanup
.auto-deploy:
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v1.0.6"
build: build:
services: services:
...@@ -163,4 +165,4 @@ integrationtest: ...@@ -163,4 +165,4 @@ integrationtest:
- sed -i "s#^APP_URL=.*#APP_URL=$URL#g" .env - sed -i "s#^APP_URL=.*#APP_URL=$URL#g" .env
- sed -i "s#^BRANCH_NAME=.*#BRANCH_NAME=$CI_COMMIT_REF_NAME#g" .env - sed -i "s#^BRANCH_NAME=.*#BRANCH_NAME=$CI_COMMIT_REF_NAME#g" .env
- sed -i "s#^COMMIT_NAME=.*#COMMIT_NAME=$CI_COMMIT_REF_SLUG#g" .env - sed -i "s#^COMMIT_NAME=.*#COMMIT_NAME=$CI_COMMIT_REF_SLUG#g" .env
- php artisan dusk - php artisan dusk
\ No newline at end of file
postgresql:
enabled: false
service: service:
externalPort: 80 externalPort: 80
internalPort: 80 internalPort: 80
......
postgresql:
enabled: false
service: service:
externalPort: 80 externalPort: 80
internalPort: 80 internalPort: 80
......
--- postgresql:
enabled: false
hpa: hpa:
enabled: false enabled: false
ingress: ingress:
...@@ -20,4 +21,4 @@ service: ...@@ -20,4 +21,4 @@ service:
commonName: "" commonName: ""
externalPort: 80 externalPort: 80
internalPort: 80 internalPort: 80
deploymentApiVersion: apps/v1 deploymentApiVersion: apps/v1
\ No newline at end of file
dependencies: dependencies:
- name: postgresql - name: postgresql
repository: https://kubernetes-charts.storage.googleapis.com/ repository: https://gitlab-org.gitlab.io/cluster-integration/helm-stable-archive
version: 0.7.1 version: 0.7.1
digest: sha256:358ce85fe4d3461ea6bb96713470a80de9c1324214a2e6f97d800298c02530e2 digest: sha256:0a7e2f279e3b8063cfe6365a56601227ff8934fa70a0434df0485bce9590be56
generated: 2017-08-28T15:22:30.690341342-05:00 generated: "2020-10-21T09:35:20.464079556+07:00"
dependencies: dependencies:
# This is a legacy in-cluster PostgreSQL dependency that is no longer used for newer installations.
# We can remove this dependency when we drop support for the legacy instances.
- name: postgresql - name: postgresql
version: "0.7.1" version: "0.7.1"
repository: "https://kubernetes-charts.storage.googleapis.com/" repository: "@stable-archive"
condition: postgresql.enabled condition: postgresql.enabled
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment