Merge branch 'trunk'

This commit is contained in:
Jérémy Munsch 2026-10-23 12:59:55 +02:00
commit 1f578b8d32
Signed by: forge-joniko
GPG key ID: D7EFE2F5CB6CC0E4
3 changed files with 22 additions and 14 deletions

View file

@ -2,7 +2,7 @@
stage: build
image:
name: gcr.io/kaniko-project/executor:v1.23.2-debug
entrypoint: [ "" ]
entrypoint: [""]
script:
- mkdir -p config
- |
@ -21,7 +21,9 @@
collation = "utf8mb4_0900_ai_ci"
[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}"
@ -97,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:
@ -105,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
@ -116,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

View file

@ -1,4 +1,4 @@
FROM matomo:5.5.0-apache
FROM matomo:5.14.2-apache
RUN a2enmod rewrite && \
apt-get update && apt-get install -y --no-install-recommends libcap2-bin && \

View file

@ -26,6 +26,13 @@ spec:
envFrom:
- configMapRef:
name: ${CI_PROJECT_PATH_SLUG}-config-map
resources:
limits:
cpu: "${APP_CI_CPU_LIMIT}"
memory: "${APP_CI_MEMORY_LIMIT}"
requests:
cpu: "${APP_CI_CPU_REQUEST}"
memory: "${APP_CI_MEMORY_REQUEST}"
imagePullSecrets:
- name: docker-registry-credentials
securityContext: