Add HRM
All checks were successful
repod / nextcloud (push) Successful in 46s
repod / nodejs (push) Successful in 1m13s

This commit is contained in:
Michel Roux 2023-07-18 21:44:12 +02:00
parent d1fcdbbe10
commit 74fee0cd5c
3 changed files with 16 additions and 10 deletions

View File

@ -7,8 +7,9 @@ ENV NEXTCLOUD_INIT_HTACCESS 1
ENV SQLITE_DATABASE repod ENV SQLITE_DATABASE repod
ENV GPODDERSYNC_VERSION 3.8.1 ENV GPODDERSYNC_VERSION 3.8.1
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \ RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
apt-get install -y nodejs && \ apt-get install -y nodejs && \
rm -f /usr/local/etc/php/conf.d/opcache-recommended.ini && \
/entrypoint.sh true /entrypoint.sh true
USER www-data USER www-data
@ -22,5 +23,3 @@ RUN curl -sSLo /tmp/gpoddersync.tar.gz https://github.com/thrillfall/nextcloud-g
php occ config:system:set debug --value=true php occ config:system:set debug --value=true
USER root USER root
RUN rm -f /usr/local/etc/php/conf.d/opcache-recommended.ini

12
composer.lock generated
View File

@ -94,16 +94,16 @@
}, },
{ {
"name": "php-cs-fixer/shim", "name": "php-cs-fixer/shim",
"version": "v3.21.1", "version": "v3.22.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHP-CS-Fixer/shim.git", "url": "https://github.com/PHP-CS-Fixer/shim.git",
"reference": "828e9934f5ff282e8fb9cac21898bc361e569342" "reference": "f6692934a6d1fe40fd8bc3339487490baa4a6700"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/828e9934f5ff282e8fb9cac21898bc361e569342", "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/f6692934a6d1fe40fd8bc3339487490baa4a6700",
"reference": "828e9934f5ff282e8fb9cac21898bc361e569342", "reference": "f6692934a6d1fe40fd8bc3339487490baa4a6700",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -140,9 +140,9 @@
"description": "A tool to automatically fix PHP code style", "description": "A tool to automatically fix PHP code style",
"support": { "support": {
"issues": "https://github.com/PHP-CS-Fixer/shim/issues", "issues": "https://github.com/PHP-CS-Fixer/shim/issues",
"source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.21.1" "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.22.0"
}, },
"time": "2023-07-05T21:51:13+00:00" "time": "2023-07-16T23:08:49+00:00"
}, },
{ {
"name": "psalm/phar", "name": "psalm/phar",

View File

@ -8,12 +8,13 @@ use OCA\RePod\AppInfo\Application;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IRequest; use OCP\IRequest;
use OCP\Util; use OCP\Util;
class PageController extends Controller class PageController extends Controller
{ {
public function __construct(IRequest $request) { public function __construct(IRequest $request, private IConfig $config) {
parent::__construct(Application::APP_ID, $request); parent::__construct(Application::APP_ID, $request);
} }
@ -27,6 +28,12 @@ class PageController extends Controller
$csp = new ContentSecurityPolicy(); $csp = new ContentSecurityPolicy();
$csp->addAllowedImageDomain('*'); $csp->addAllowedImageDomain('*');
if ($this->config->getSystemValueBool('debug')) {
// Unblock HMR requests.
$csp->addAllowedConnectDomain('*');
$csp->addAllowedScriptDomain('*');
}
$response = new TemplateResponse(Application::APP_ID, 'main'); $response = new TemplateResponse(Application::APP_ID, 'main');
$response->setContentSecurityPolicy($csp); $response->setContentSecurityPolicy($csp);
return $response; return $response;