From c38203e99f2d7d670e337ceffb98b478ce3dd7b1 Mon Sep 17 00:00:00 2001
From: Joakim Olsson <joakim@unbound.se>
Date: Sat, 5 Dec 2020 14:13:54 +0100
Subject: [PATCH] chore: remove ssl redirect since ingress controller handles
 that

---
 .gitlab-ci.yml        | 10 +++++++---
 k8s/ingress-prod.yaml |  1 -
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 712fa20..9a4b7a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/k8s/ingress-prod.yaml b/k8s/ingress-prod.yaml
index 80da4b3..af2152d 100644
--- a/k8s/ingress-prod.yaml
+++ b/k8s/ingress-prod.yaml
@@ -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"
-- 
2.52.0