Merge branch 'trunk'
This commit is contained in:
commit
5918f69d1d
4 changed files with 402 additions and 336 deletions
|
|
@ -1,4 +1,4 @@
|
|||
FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.2:latest
|
||||
FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-8.2:170625-080812
|
||||
COPY --chown=www-data:www-data . /app/srcs
|
||||
USER root
|
||||
RUN chmod -R 755 /app/srcs/public/app/uploads
|
||||
|
|
|
|||
|
|
@ -26,9 +26,8 @@
|
|||
"oscarotero/env": "^2.1",
|
||||
"roots/bedrock-autoloader": "^1.0",
|
||||
"roots/bedrock-disallow-indexing": "^2.0",
|
||||
"roots/wordpress": "^6.5",
|
||||
"roots/wordpress": "^6.8",
|
||||
"roots/wp-config": "1.0.0",
|
||||
"roots/wp-password-bcrypt": "1.1.0",
|
||||
"wpackagist-plugin/wordpress-seo": "^22.8",
|
||||
"wpengine/advanced-custom-fields-pro": "^6.2",
|
||||
"uwil/admin-secure-wp": "^2.0",
|
||||
|
|
@ -81,4 +80,4 @@
|
|||
"phpcs"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
727
composer.lock
generated
727
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -7,7 +7,7 @@ data:
|
|||
DB_NAME: "${APP_DB_NAME}"
|
||||
DB_USER: "${APP_DB_USER}"
|
||||
DB_PASSWORD: "${APP_DB_PASSWORD}"
|
||||
DB_HOST: "mariadb.common-services"
|
||||
DB_HOST: "${APP_DB_HOST}"
|
||||
DB_PREFIX: "ldc_"
|
||||
WP_ENV: "${APP_WP_ENV}"
|
||||
WP_HOME: "https://www.${APP_DOMAIN}"
|
||||
|
|
@ -98,7 +98,7 @@ spec:
|
|||
app: ${CI_PROJECT_PATH_SLUG}-app
|
||||
ports:
|
||||
- port: 80
|
||||
targetPort: 443
|
||||
targetPort: 80
|
||||
|
||||
---
|
||||
apiVersion: traefik.io/v1alpha1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue