Merge branch 'ingress' into 'master'

chore: remove ssl redirect since ingress controller handles that

See merge request unboundsoftware/dancefinder/dancefinder-app!13
This commit was merged in pull request #62.
This commit is contained in:
2020-12-05 13:29:48 +00:00
2 changed files with 7 additions and 4 deletions
+7 -3
View File
@@ -3,14 +3,18 @@ stages:
- deploy
variables:
DOCKER_HOST: tcp://docker:2375/
DOCKER_HOST: tcp://docker:2376
DOCKER_TLS_CERTDIR: "/certs"
DOCKER_TLS_VERIFY: 1
DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client"
DOCKER_DRIVER: overlay2
image: buildtool/build-tools:0.0.11
image: buildtool/build-tools:0.0.23
build:
stage: build
services:
- docker:dind
- docker:19.03-dind
script:
- build
- push
-1
View File
@@ -5,7 +5,6 @@ metadata:
annotations:
kubernetes.io/ingress.class: "nginx"
nginx.ingress.kubernetes.io/enable-cors: "true"
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
spec:
rules:
- host: "dancefinder.unbound.se"