chore: remove ssl redirect since ingress controller handles that
This commit is contained in:
+29
-10
@@ -1,12 +1,31 @@
|
||||
job1:
|
||||
stage: build
|
||||
image: docker
|
||||
stages:
|
||||
- build
|
||||
- deploy-prod
|
||||
|
||||
variables:
|
||||
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.23
|
||||
services:
|
||||
- docker:dind
|
||||
- docker:19.03.12-dind
|
||||
|
||||
build:
|
||||
stage: build
|
||||
script:
|
||||
- docker version
|
||||
- docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:latest .
|
||||
- docker tag $CI_REGISTRY_IMAGE:latest $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
||||
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
|
||||
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
||||
- docker push $CI_REGISTRY_IMAGE:latest
|
||||
- build
|
||||
- push
|
||||
|
||||
deploy-to-prod:
|
||||
stage: deploy-prod
|
||||
when: on_success
|
||||
script:
|
||||
- echo Deploy to PROD.
|
||||
- deploy prod
|
||||
environment:
|
||||
name: prod
|
||||
only:
|
||||
- master
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: lingonpaj-site
|
||||
@@ -1,4 +1,4 @@
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: networking.k8s.io/v1beta1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: lingonpaj-site-ingress
|
||||
@@ -1,11 +1,10 @@
|
||||
apiVersion: extensions/v1beta1
|
||||
apiVersion: networking.k8s.io/v1beta1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: lingonpaj-site-ingress
|
||||
annotations:
|
||||
kubernetes.io/ingress.class: "nginx"
|
||||
ingress.kubernetes.io/enable-cors: "true"
|
||||
ingress.kubernetes.io/force-ssl-redirect: "false"
|
||||
nginx.ingress.kubernetes.io/enable-cors: "true"
|
||||
spec:
|
||||
rules:
|
||||
- host: "lingonpaj.com"
|
||||
Reference in New Issue
Block a user