From 7fe973962535954db081657f292f0d4de2d6a6b1 Mon Sep 17 00:00:00 2001 From: Alexandre BRACH Date: Thu, 13 Jun 2019 11:22:10 +0200 Subject: [PATCH 1/3] PHRDPL-61 #comment worker use the app user to run jobs --- Dockerfile | 6 +++++- README.md | 4 +++- docker/phraseanet/worker-boot.sh | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100755 docker/phraseanet/worker-boot.sh diff --git a/Dockerfile b/Dockerfile index b2bfe4a355..9f1821fb6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -88,7 +88,7 @@ COPY templates /var/alchemy/templates COPY tests /var/alchemy/tests # Phraseanet -FROM php:7.0-fpm-stretch as phraseanet +FROM php:7.0-fpm-stretch as phraseanet-fpm RUN apt-get update \ && apt-get install -y \ apt-transport-https \ @@ -152,6 +152,10 @@ WORKDIR /var/alchemy/Phraseanet ENTRYPOINT ["/phraseanet-entrypoint.sh"] CMD ["/boot.sh"] +# phraseanet-worker +FROM phraseanet-fpm as phraseanet-worker +CMD ["/worker-boot.sh"] + # phraseanet-nginx FROM nginx:1.15 as phraseanet-nginx RUN useradd -u 1000 app diff --git a/README.md b/README.md index 18948ebd57..2423542ef9 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,8 @@ The two images can be built respectively with these two commands : docker build --target phraseanet-nginx -t local/phraseanet-nginx . # php-fpm application - docker build --target phraseanet -t local/phraseanet . + docker build --target phraseanet-fpm -t local/phraseanet-fpm . + # worker + docker build --target phraseanet-worker -t local/phraseanet-worker . diff --git a/docker/phraseanet/worker-boot.sh b/docker/phraseanet/worker-boot.sh new file mode 100755 index 0000000000..1b972c6cdb --- /dev/null +++ b/docker/phraseanet/worker-boot.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +runuser app -c 'php /var/alchemy/Phraseanet/bin/console task-manager:scheduler:run' From ffc1370cddea687593e6ec5a92bcabe172ff7668 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Thu, 13 Jun 2019 11:47:28 +0200 Subject: [PATCH 2/3] PHRDPL-61 #comment update readme --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2423542ef9..9fb4237d25 100644 --- a/README.md +++ b/README.md @@ -56,13 +56,14 @@ For development with Phraseanet API see https://docs.phraseanet.com/4.0/en/Devel WARNING : still in a work-in-progress status and can be used only for test purposes. -The docker distribution come with 2 differents containers : -* an nginx that act as the front http server. -* the php-fpm who serves the php files through nginx. +The docker distribution come with 3 differents containers : +* An nginx that act as the front http server. +* The php-fpm who serves the php files through nginx. +* The worker who execute Phraseanet scheduler. ## How to build -The two images can be built respectively with these two commands : +The three images can be built respectively with these commands : # nginx server docker build --target phraseanet-nginx -t local/phraseanet-nginx . From 985ee2220a637553e20db44a539b73b401b4bd2a Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Thu, 13 Jun 2019 15:20:46 +0400 Subject: [PATCH 3/3] PHRAS-2618 #comment fix title and description display #time 2h --- resources/www/permaview/styles/main.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/www/permaview/styles/main.scss b/resources/www/permaview/styles/main.scss index 8f347b1541..a7ed1a6526 100644 --- a/resources/www/permaview/styles/main.scss +++ b/resources/www/permaview/styles/main.scss @@ -40,6 +40,7 @@ h1 { font-size: 26px; font-weight: bold; padding: 30px 0 20px; + word-break: break-all; } .content-container { @@ -65,6 +66,9 @@ h1 { dl { margin-bottom: 20px; + &.dl-horizontal { + word-break: break-all; + } } dt,