chore: upgrade build tools and fix ingress

This commit is contained in:
2020-12-05 14:02:04 +01:00
parent 9d6d0667b7
commit 473b3b20d3
4 changed files with 11 additions and 9 deletions
+8 -5
View File
@@ -3,14 +3,18 @@ stages:
- deploy-prod - deploy-prod
variables: 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: registry.gitlab.com/sparetimecoders/build-tools image: buildtool/build-tools:0.0.23
services:
- docker:19.03.12-dind
build: build:
stage: build stage: build
services:
- docker:dind
script: script:
- build - build
- push - push
@@ -20,7 +24,6 @@ deploy-to-prod:
when: on_success when: on_success
script: script:
- echo Deploy to PROD. - echo Deploy to PROD.
- kubectl config get-contexts
- deploy prod - deploy prod
environment: environment:
name: prod name: prod
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: unbound-site name: unbound-site
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1 apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: unbound-site-ingress name: unbound-site-ingress
@@ -1,11 +1,10 @@
apiVersion: extensions/v1beta1 apiVersion: networking.k8s.io/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: unbound-site-ingress name: unbound-site-ingress
annotations: annotations:
kubernetes.io/ingress.class: "nginx" kubernetes.io/ingress.class: "nginx"
ingress.kubernetes.io/enable-cors: "true" ingress.kubernetes.io/enable-cors: "true"
ingress.kubernetes.io/force-ssl-redirect: "true"
spec: spec:
rules: rules:
- host: "unbound.se" - host: "unbound.se"