forge-joniko/ldc-qrcollector-back
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Vincent BRIDIER 2023-09-12 10:04:08 +02:00
commit 7023d8317d
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
6 changed files with 23 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.env.example
View file

@ -23,9 +23,5 @@ MAIL_FROM_NAME="${APP_NAME}"
# SENTRY
SENTRY_LARAVEL_DSN=
# LDC WEB STATUS CHECKER
LDC_STATUS_CHECKER_API_KEY="MY_KEY"
LDC_STATUS_CHECKER_UUID="UUID_PROJECT"
#LDC WEB ADMIN SECURE
LDC_WEB_API_KEY="MY_KEY"

5
Dockerfile
View file

@ -1,8 +1,5 @@
FROM registry.s-web.fr/ldc-web/projets/ldc-web-images-docker/ldcweb-production-7.3:latest
COPY --chown=www-data:www-data . /app/srcs
COPY --chown=www-data:www-data ./public/build /app/srcs/public/build
COPY --chown=www-data:www-data ./vendor /app/srcs/vendor
USER root
RUN chmod -R 755 /app/srcs/storage
USER www-data
#ENTRYPOINT cd /app/srcs && php artisan storage:link
USER www-data

13
composer.json
View file

@ -1,16 +1,8 @@
{
"name": "laravel/laravel",
"name": "uwil/qrcollector-back",
"version": "1.0.0",
"type": "project",
"time": "2023-03-02",
"description": "The Laravel Framework.",
"support": {
"email": "equipe.web@ldc.fr"
},
"keywords": [
"framework",
"laravel"
],
"description": "Administration interface for QRCollector",
"license": "MIT",
"require": {
"php": "^7.3|^8.0",
@ -23,7 +15,6 @@
"laravel/tinker": "^2.5",
"laravel/ui": "^3.4",
"ldc/web-admin-secure-laravel": "^1.0",
"ldc/web-status-checker-laravel": "^1.0",
"mews/purifier": "^3.3",
"sentry/sentry-laravel": "^3.2",
"spatie/laravel-mix-preload": "^1.3"

112
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "7e2444d1e4624c7536ba1dad78f0a424",
"content-hash": "a016428bf29d21ef8e8f541266808f09",
"packages": [
{
"name": "asm89/stack-cors",
@ -1955,116 +1955,6 @@
],
"description": "Restrict access to LDC Network"
},
{
"name": "ldc/web-status-checker",
"version": "1.0.2",
"source": {
"type": "git",
"url": "https://lab.s-web.fr/ldc-web/projets/ldc-web-status-checker.git",
"reference": "70a4f96a272f42f9caaf8f614190a3e061273bc8"
},
"dist": {
"type": "zip",
"url": "https://lab.s-web.fr/api/v4/projects/21/packages/composer/archives/ldc/web-status-checker.zip?sha=70a4f96a272f42f9caaf8f614190a3e061273bc8",
"reference": "70a4f96a272f42f9caaf8f614190a3e061273bc8",
"shasum": ""
},
"require": {
"ext-curl": "*",
"php": "~7.3|7.4|~8"
},
"require-dev": {
"slevomat/coding-standard": "^7.0",
"squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"autoload": {
"psr-4": {
"LDC\\WebStatusChecker\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"LDC\\WebStatusChecker\\Tests\\": "tests"
}
},
"license": [
"MIT"
],
"authors": [
{
"name": "Jérémy Munsch",
"email": "jeremy.munsch@ldc.fr",
"homepage": "https://jeremydev.ovh"
}
],
"description": "Status checker: report status to ldc-web"
},
{
"name": "ldc/web-status-checker-laravel",
"version": "1.0.3",
"source": {
"type": "git",
"url": "https://lab.s-web.fr/ldc-web/projets/ldc-web-status-checker-laravel.git",
"reference": "32965e7425060c4167b40e5c0868c438ea94c14f"
},
"dist": {
"type": "zip",
"url": "https://lab.s-web.fr/api/v4/projects/22/packages/composer/archives/ldc/web-status-checker-laravel.zip?sha=32965e7425060c4167b40e5c0868c438ea94c14f",
"reference": "32965e7425060c4167b40e5c0868c438ea94c14f",
"shasum": ""
},
"require": {
"illuminate/support": "~8|~9",
"laravel/framework": "~8|~9",
"ldc/web-status-checker": "^1.0",
"php": "~7.3|7.4|~8"
},
"require-dev": {
"orchestra/testbench": "^6.24",
"phpunit/php-code-coverage": "^9.2",
"phpunit/phpunit": "~9.0",
"slevomat/coding-standard": "^7.0",
"squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"LDC\\WebStatusCheckerLaravel\\StatusCheckerServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"LDC\\WebStatusCheckerLaravel\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"LDC\\WebStatusCheckerLaravel\\Tests\\": "tests"
}
},
"scripts": {
"test": [
"vendor/bin/phpunit"
],
"post-autoload-dump": [
"@php ./vendor/bin/testbench package:discover --ansi"
]
},
"license": [
"MIT"
],
"authors": [
{
"name": "Jérémy Munsch",
"email": "jeremy.munsch@ldc.fr",
"homepage": "https://jeremydev.ovh"
}
],
"description": "Status checker: report status to ldc-web"
},
{
"name": "league/commonmark",
"version": "1.6.7",

17
config/logging.php
View file

@ -118,6 +118,23 @@ return [
'emergency' => [
'path' => storage_path('logs/laravel.log'),
],
'stdout' => [
'driver' => 'monolog',
'level' => env('LOG_LEVEL', 'debug'),
'handler' => StreamHandler::class,
'formatter' => env('LOG_STDOUT_FORMATTER'),
'with' => [
'stream' => 'php://stdout',
],
],
'k8s' => [
'driver' => 'stack',
'channels' => ['daily', 'stdout'],
'ignore_exceptions' => false,
],
],
];

6
manifest.yaml
View file

@ -9,7 +9,7 @@ data:
APP_DEBUG: "${APP_APP_DEBUG}"
APP_URL: "https://${APP_DOMAIN}"
APP_URL_FRONT: "${APP_APP_URL_FRONT}"
LOG_CHANNEL: "daily"
LOG_CHANNEL: "k8s"
DB_HOST: "mariadb-service.common-services"
DB_DATABASE: "${APP_DB_DATABASE}"
DB_USERNAME: "${APP_DB_USERNAME}"
@ -21,8 +21,6 @@ data:
MAIL_ENCRYPTION: "${APP_MAIL_ENCRYPTION}"
MAIL_FROM_ADDRESS: "${APP_MAIL_FROM_ADDRESS}"
MAIL_FROM_NAME: "${APP_APP_NAME}"
LDC_STATUS_CHECKER_API_KEY: "${APP_LDC_WEB_API_KEY}"
LDC_STATUS_CHECKER_UUID: "${APP_LDC_STATUS_CHECKER_UUID}"
LDC_WEB_API_KEY: "${APP_LDC_WEB_API_KEY}"
SENTRY_LARAVEL_DSN: "${APP_SENTRY_LARAVEL_DSN}"
@ -87,7 +85,7 @@ spec:
app: ${CI_PROJECT_PATH_SLUG}-app
ports:
- port: 80
targetPort: 4433
targetPort: 443
---
apiVersion: traefik.containo.us/v1alpha1