chore: fix forward proto within k8s host
This commit is contained in:
parent
5369afee72
commit
350befa2fd
1 changed files with 13 additions and 13 deletions
|
|
@ -2,7 +2,7 @@
|
|||
stage: build
|
||||
image:
|
||||
name: gcr.io/kaniko-project/executor:v1.23.2-debug
|
||||
entrypoint: [ "" ]
|
||||
entrypoint: [""]
|
||||
script:
|
||||
- mkdir -p config
|
||||
- |
|
||||
|
|
@ -23,6 +23,7 @@
|
|||
[General]
|
||||
enable_load_data_infile = 0
|
||||
force_ssl = 1
|
||||
proxy_scheme_headers[] = "HTTP_X_FORWARDED_PROTO"
|
||||
proxy_client_headers[] = "HTTP_X_FORWARDED_FOR"
|
||||
proxy_host_headers[] = "HTTP_X_FORWARDED_HOST"
|
||||
salt = "${APP_MATOMO_SALT}"
|
||||
|
|
@ -98,7 +99,6 @@
|
|||
- /kaniko/executor --context "${CI_PROJECT_DIR}" --build-arg "GITLAB_USER=${CI_DEPLOY_USER}" --build-arg "GITLAB_PASSWORD=${CI_DEPLOY_PASSWORD}" --dockerfile "${CI_PROJECT_DIR}/Dockerfile" --destination "${IMAGE_TAG}" --cache=true --cache-ttl 24h
|
||||
allow_failure: false
|
||||
|
||||
|
||||
docker-build:staging:
|
||||
extends: .docker-build
|
||||
environment:
|
||||
|
|
@ -106,9 +106,9 @@ docker-build:staging:
|
|||
variables:
|
||||
IMAGE_TAG: "${CI_REGISTRY_IMAGE}:s-${CI_COMMIT_SHA}"
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == "trunk"
|
||||
when: manual
|
||||
allow_failure: true
|
||||
- if: $CI_COMMIT_BRANCH == "trunk"
|
||||
when: manual
|
||||
allow_failure: true
|
||||
|
||||
docker-build:latest:
|
||||
extends: .docker-build
|
||||
|
|
@ -117,15 +117,15 @@ docker-build:latest:
|
|||
variables:
|
||||
IMAGE_TAG: "${CI_REGISTRY_IMAGE}:p-${CI_COMMIT_SHA}"
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master"
|
||||
when: manual
|
||||
allow_failure: true
|
||||
- if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master"
|
||||
when: manual
|
||||
allow_failure: true
|
||||
|
||||
include:
|
||||
- project: 'ldc-web/shared-ci'
|
||||
ref: 'main'
|
||||
file: 'deploy/deploy.yml'
|
||||
- project: "ldc-web/shared-ci"
|
||||
ref: "main"
|
||||
file: "deploy/deploy.yml"
|
||||
|
||||
stages:
|
||||
- build
|
||||
- deploy
|
||||
- build
|
||||
- deploy
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue