diff --git a/Dockerfile b/Dockerfile index 6481cbb..f8c9751 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,9 @@ +ARG PHP_8_5_TAG=latest + FROM composer:2.8 AS vendor +WORKDIR /app + ARG GITLAB_USER ARG GITLAB_PASSWORD @@ -8,7 +12,7 @@ COPY database/ database/ COPY composer.json composer.json COPY composer.lock composer.lock -RUN composer config gitlab-token.lab.s-web.fr ${GITLAB_USER} ${GITLAB_PASSWORD} +RUN composer config gitlab-token.lab.s-web.fr "${GITLAB_USER}" "${GITLAB_PASSWORD}" RUN composer install \ --ignore-platform-reqs \ --no-interaction \ @@ -32,7 +36,8 @@ RUN npm config set @uwil:registry https://lab.s-web.fr/api/v4/groups/ldc-web/-/p RUN npm config set -- '//lab.s-web.fr/api/v4/groups/ldc-web/-/packages/npm/:_authToken' "${GITLAB_PASSWORD}" RUN npm ci --no-audit --no-fund --loglevel=error && npm run prod -FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.3:170625-101047 +ARG PHP_8_5_TAG +FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/uwil-production-8.5:${PHP_8_5_TAG} ARG USER=www-data diff --git a/manifest.yaml b/manifest.yaml index cb127df..db1dff2 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -11,8 +11,8 @@ data: APP_URL: "https://${APP_DOMAIN}" APP_K8S_INTERNAL_URL: "${APP_APP_K8S_INTERNAL_URL}" LOG_CHANNEL: "k8s" - DB_HOST: "${APP_DB_HOST}" - DB_PORT: "${APP_DB_PORT}" + DB_HOST: "${APP_GLOBAL_OVH_MYSQL_HOST}" + DB_PORT: "${APP_GLOBAL_OVH_MYSQL_PORT}" DB_DATABASE: "${APP_DB_DATABASE}" DB_USERNAME: "${APP_DB_USERNAME}" DB_PASSWORD: "${APP_DB_PASSWORD}" @@ -83,7 +83,12 @@ spec: lifecycle: preStop: exec: - command: ["/bin/sh","-c","kill -s TERM 1; while test $(ps ax | grep -v grep | grep bash | wc -l) -gt 0; do sleep 2s; done"] + command: + [ + "/bin/sh", + "-c", + "kill -s TERM 1; while test $(ps ax | grep -v grep | grep bash | wc -l) -gt 0; do sleep 2s; done", + ] resources: limits: cpu: "${APP_CI_CPU_LIMIT}"