From 922884452be32718bdd656e3d9d9ba5b53e641ea Mon Sep 17 00:00:00 2001 From: Moctar Date: Wed, 13 Jan 2021 10:55:42 +0100 Subject: [PATCH 01/16] PHRAS-3330 add worker queue name env and allow worker run exploded --- .env | 17 +++++++++++++++++ Dockerfile | 2 +- docker-compose.yml | 15 +++++++++++++++ docker/phraseanet/worker/entrypoint.sh | 16 ++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/.env b/.env index 1fa61ee344..6edfbfd38b 100644 --- a/.env +++ b/.env @@ -90,6 +90,23 @@ PHRASEANET_SMTP_SECURE_MODE=tls PHRASEANET_SMTP_USER= PHRASEANET_SMTP_PASSWORD= +# Phraseanet Workers setting + +PHRASEANET_WORKER_assetIngest=1 +PHRASEANET_WORKER_createRecord=2 +PHRASEANET_WORKER_deleteRecord=2 +PHRASEANET_WORKER_exportMail=2 +PHRASEANET_WORKER_exposeUpload=2 +PHRASEANET_WORKER_ftp=1 +PHRASEANET_WORKER_mainQueue=3 +PHRASEANET_WORKER_populateIndex=1 +PHRASEANET_WORKER_pullAssets=1 +PHRASEANET_WORKER_recordEdit=2 +PHRASEANET_WORKER_subdefCreation=1 +PHRASEANET_WORKER_subtitle=1 +PHRASEANET_WORKER_validationReminder=1 +PHRASEANET_WORKER_webhook=1 +PHRASEANET_WORKER_writeMetadatas=1 # Locale setting diff --git a/Dockerfile b/Dockerfile index adf98b9b06..df7a049884 100644 --- a/Dockerfile +++ b/Dockerfile @@ -215,7 +215,7 @@ CMD ["php-fpm", "-F"] FROM phraseanet-fpm as phraseanet-worker ENTRYPOINT ["docker/phraseanet/worker/entrypoint.sh"] -CMD ["bin/console", "worker:execute"] +CMD ["/bin/bash", "bin/run-worker.sh"] ######################################################################### # phraseanet-nginx diff --git a/docker-compose.yml b/docker-compose.yml index 1f9c13b271..95dd2abbd7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -135,6 +135,21 @@ services: - LC_CTYPE=C.UTF-8 - LC_TIME=C.UTF-8 - LC_NAME=C.UTF-8 + - PHRASEANET_WORKER_assetIngest + - PHRASEANET_WORKER_createRecord + - PHRASEANET_WORKER_deleteRecord + - PHRASEANET_WORKER_exportMail + - PHRASEANET_WORKER_exposeUpload + - PHRASEANET_WORKER_ftp + - PHRASEANET_WORKER_mainQueue + - PHRASEANET_WORKER_populateIndex + - PHRASEANET_WORKER_pullAssets + - PHRASEANET_WORKER_recordEdit + - PHRASEANET_WORKER_subdefCreation + - PHRASEANET_WORKER_subtitle + - PHRASEANET_WORKER_validationReminder + - PHRASEANET_WORKER_webhook + - PHRASEANET_WORKER_writeMetadatas - IMAGEMAGICK_POLICY_VERSION - IMAGEMAGICK_POLICY_WIDTH - IMAGEMAGICK_POLICY_HEIGHT diff --git a/docker/phraseanet/worker/entrypoint.sh b/docker/phraseanet/worker/entrypoint.sh index 9526bb01f7..c084b9fd93 100755 --- a/docker/phraseanet/worker/entrypoint.sh +++ b/docker/phraseanet/worker/entrypoint.sh @@ -29,4 +29,20 @@ if [ -f /etc/ImageMagick-$IMAGEMAGICK_POLICY_VERSION/policy.xml ]; then sed -i "s/.*domain=\"resource\" name=\"temporary-path\" value=\".*//g" /etc/ImageMagick-$IMAGEMAGICK_POLICY_VERSION/policy.xml fi +rm -rf bin/run-worker.sh +for i in `env | grep PHRASEANET_WORKER_ | cut -d'=' -f1` + do + queue_name="$(echo $i | cut -d'_' -f3)" + m=$i + command="bin/console worker:execute --queue-name=$queue_name -m ${!m} &" + echo $command >> bin/run-worker.sh + done + +echo 'while true; + do + sleep 10s + nb_process=`ps faux | grep "worker:execute" | grep php | wc -l` + echo $nb_process + done ' >> bin/run-worker.sh + runuser -u app -- $@ From ddeac864809648bbfd5b80b9f9b7614f841a38ee Mon Sep 17 00:00:00 2001 From: Moctar Date: Wed, 13 Jan 2021 16:45:27 +0100 Subject: [PATCH 02/16] PHRAS-3330 manage multiple processes and exit code and wait --- .env | 4 +-- docker-compose.yml | 3 +- docker/phraseanet/worker/entrypoint.sh | 38 +++++++++++++++++--------- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/.env b/.env index 6edfbfd38b..14724718fb 100644 --- a/.env +++ b/.env @@ -91,8 +91,8 @@ PHRASEANET_SMTP_USER= PHRASEANET_SMTP_PASSWORD= # Phraseanet Workers setting - -PHRASEANET_WORKER_assetIngest=1 +PHRASEANET_WORKER_explode=1 +PHRASEANET_WORKER_assetsIngest=1 PHRASEANET_WORKER_createRecord=2 PHRASEANET_WORKER_deleteRecord=2 PHRASEANET_WORKER_exportMail=2 diff --git a/docker-compose.yml b/docker-compose.yml index 95dd2abbd7..2cae2ad452 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -135,7 +135,8 @@ services: - LC_CTYPE=C.UTF-8 - LC_TIME=C.UTF-8 - LC_NAME=C.UTF-8 - - PHRASEANET_WORKER_assetIngest + - PHRASEANET_WORKER_explode + - PHRASEANET_WORKER_assetsIngest - PHRASEANET_WORKER_createRecord - PHRASEANET_WORKER_deleteRecord - PHRASEANET_WORKER_exportMail diff --git a/docker/phraseanet/worker/entrypoint.sh b/docker/phraseanet/worker/entrypoint.sh index c084b9fd93..11bb0d58a5 100755 --- a/docker/phraseanet/worker/entrypoint.sh +++ b/docker/phraseanet/worker/entrypoint.sh @@ -30,19 +30,31 @@ if [ -f /etc/ImageMagick-$IMAGEMAGICK_POLICY_VERSION/policy.xml ]; then fi rm -rf bin/run-worker.sh -for i in `env | grep PHRASEANET_WORKER_ | cut -d'=' -f1` - do - queue_name="$(echo $i | cut -d'_' -f3)" - m=$i - command="bin/console worker:execute --queue-name=$queue_name -m ${!m} &" - echo $command >> bin/run-worker.sh - done +if [ ${PHRASEANET_WORKER_explode} == "1" ]; then + for i in `env | grep PHRASEANET_WORKER_ | cut -d'=' -f1` + do + queue_name="$(echo $i | cut -d'_' -f3)" + m=$i + command="bin/console worker:execute --queue-name=$queue_name -m ${!m} &" + echo $command >> bin/run-worker.sh + done -echo 'while true; - do - sleep 10s - nb_process=`ps faux | grep "worker:execute" | grep php | wc -l` - echo $nb_process - done ' >> bin/run-worker.sh + echo 'WORKER_NB_QUEUES=`env | grep PHRASEANET_WORKER_ | wc -l` + WORKER_LOOP_VALUE=20s + while true; + do + sleep $WORKER_LOOP_VALUE + nb_process=`ps faux | grep "worker:execute" | grep php | wc -l` + echo $nb_process running workers + if [ $nb_process -lt $WORKER_NB_QUEUES ] + then + exit 1 + break + fi + done ' >> bin/run-worker.sh +else + command="bin/console worker:execute --queue-name=$queue_name" + echo $command >> bin/run-worker.sh +fi runuser -u app -- $@ From 6aef9187521e4faae10b39705d63e854570c65d0 Mon Sep 17 00:00:00 2001 From: Moctar Date: Wed, 13 Jan 2021 19:44:41 +0100 Subject: [PATCH 03/16] PHRAS-3330 fix number of queue env value --- .env | 2 +- docker-compose.yml | 2 +- docker/phraseanet/worker/entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 14724718fb..b21abe508b 100644 --- a/.env +++ b/.env @@ -91,7 +91,7 @@ PHRASEANET_SMTP_USER= PHRASEANET_SMTP_PASSWORD= # Phraseanet Workers setting -PHRASEANET_WORKER_explode=1 +PHRASEANET_EXPLODE_WORKER=1 PHRASEANET_WORKER_assetsIngest=1 PHRASEANET_WORKER_createRecord=2 PHRASEANET_WORKER_deleteRecord=2 diff --git a/docker-compose.yml b/docker-compose.yml index 2cae2ad452..58d2683e57 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -135,7 +135,7 @@ services: - LC_CTYPE=C.UTF-8 - LC_TIME=C.UTF-8 - LC_NAME=C.UTF-8 - - PHRASEANET_WORKER_explode + - PHRASEANET_EXPLODE_WORKER - PHRASEANET_WORKER_assetsIngest - PHRASEANET_WORKER_createRecord - PHRASEANET_WORKER_deleteRecord diff --git a/docker/phraseanet/worker/entrypoint.sh b/docker/phraseanet/worker/entrypoint.sh index 11bb0d58a5..d8541e9731 100755 --- a/docker/phraseanet/worker/entrypoint.sh +++ b/docker/phraseanet/worker/entrypoint.sh @@ -30,7 +30,7 @@ if [ -f /etc/ImageMagick-$IMAGEMAGICK_POLICY_VERSION/policy.xml ]; then fi rm -rf bin/run-worker.sh -if [ ${PHRASEANET_WORKER_explode} == "1" ]; then +if [ ${PHRASEANET_EXPLODE_WORKER} == "1" ]; then for i in `env | grep PHRASEANET_WORKER_ | cut -d'=' -f1` do queue_name="$(echo $i | cut -d'_' -f3)" From 64fe78f804d287ed16eb87562464d08d09d726ef Mon Sep 17 00:00:00 2001 From: Moctar Date: Wed, 13 Jan 2021 20:10:04 +0100 Subject: [PATCH 04/16] PHRAS-3336 set defaut env vars for mailhog --- .env | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.env b/.env index b21abe508b..f191fb418d 100644 --- a/.env +++ b/.env @@ -81,12 +81,12 @@ PHRASEANET_API_AUTH_TOKEN_HEADER_ONLY=false # Phraseanet mail configuration PHRASEANET_EMITTER_EMAIL=phraseanet@example.com -PHRASEANET_MAIL_OBJECT_PREFIX= -PHRASEANET_SMTP_ENABLED=false -PHRASEANET_SMTP_HOST= -PHRASEANET_SMTP_PORT= +PHRASEANET_MAIL_OBJECT_PREFIX="phraseanet" +PHRASEANET_SMTP_ENABLED=true +PHRASEANET_SMTP_HOST=mailhog +PHRASEANET_SMTP_PORT=1025 PHRASEANET_SMTP_AUTH_ENABLED=false -PHRASEANET_SMTP_SECURE_MODE=tls +PHRASEANET_SMTP_SECURE_MODE=null PHRASEANET_SMTP_USER= PHRASEANET_SMTP_PASSWORD= From d564b17dd58dc213dc771d833bfaa0f156ced2b2 Mon Sep 17 00:00:00 2001 From: Moctar Date: Thu, 14 Jan 2021 10:31:23 +0100 Subject: [PATCH 05/16] PHRAS-3336 fix bad smtp secure-mode variable --- docker/phraseanet/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/phraseanet/entrypoint.sh b/docker/phraseanet/entrypoint.sh index 4fd1e76c79..baa3092ee3 100755 --- a/docker/phraseanet/entrypoint.sh +++ b/docker/phraseanet/entrypoint.sh @@ -38,7 +38,7 @@ if [ -f "$FILE" ]; then if [[ $PHRASEANET_SMTP_ENABLED && $PHRASEANET_SMTP_ENABLED = true ]]; then bin/setup system:config set registry.email.smtp-enabled $PHRASEANET_SMTP_ENABLED bin/setup system:config set registry.email.smtp-auth-enabled $PHRASEANET_SMTP_AUTH_ENABLED - bin/setup system:config set registry.email.smtp-auth-secure-mode $PHRASEANET_SMTP_SECURE_MODE + bin/setup system:config set registry.email.smtp-secure-mode $PHRASEANET_SMTP_SECURE_MODE bin/setup system:config set registry.email.smtp-host $PHRASEANET_SMTP_HOST bin/setup system:config set registry.email.smtp-port $PHRASEANET_SMTP_PORT bin/setup system:config set registry.email.smtp-user $PHRASEANET_SMTP_USER From 7d268adab19051a087ead1149af078f66b5f6137 Mon Sep 17 00:00:00 2001 From: Moctar Date: Thu, 14 Jan 2021 10:36:28 +0100 Subject: [PATCH 06/16] start worker after phraseanet starts --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 58d2683e57..03bd619603 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -119,6 +119,7 @@ services: - redis - rabbitmq - elasticsearch + - phraseanet environment: - PHRASEANET_PROJECT_NAME - PHRASEANET_TRUSTED_PROXIES From 358d645508dd64a7e9640ed0c02a6116458252ef Mon Sep 17 00:00:00 2001 From: aina esokia Date: Thu, 14 Jan 2021 16:57:10 +0300 Subject: [PATCH 07/16] fix delete icon --- templates/web/prod/preview/tools.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/web/prod/preview/tools.html.twig b/templates/web/prod/preview/tools.html.twig index 51612aa60e..ad6d6cd2a6 100644 --- a/templates/web/prod/preview/tools.html.twig +++ b/templates/web/prod/preview/tools.html.twig @@ -9,7 +9,7 @@ {% if record.is_from_basket() %} @@ -17,7 +17,7 @@ {% endif %}
- +
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(record.get_base_id(), constant('\\ACL::CANDWNLDHD')) or app.getAclForUser(app.getAuthenticatedUser()).has_right_on_base(record.get_base_id(), constant('\\ACL::CANDWNLDPREVIEW')) %} From 2cd30af3862e1eb0d3ff5a074e02ca3cf29dafb6 Mon Sep 17 00:00:00 2001 From: aina esokia Date: Thu, 14 Jan 2021 17:00:33 +0300 Subject: [PATCH 08/16] PHRAS-3257 fix detail view clic on link --- .../dist/production.js | 15 ++++++---- .../dist/production.min.js | 15 ++++++---- .../components/record/recordPreview/index.js | 28 +++++++++++-------- 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/Phraseanet-production-client/dist/production.js b/Phraseanet-production-client/dist/production.js index 6d467bf66e..1a5ad15b32 100644 --- a/Phraseanet-production-client/dist/production.js +++ b/Phraseanet-production-client/dist/production.js @@ -65249,13 +65249,12 @@ var previewRecordService = function previewRecordService(services) { event.preventDefault(); closePreview(); }).on('dblclick', '.open-preview-action', function (event) { - var $el = (0, _jquery2.default)(event.currentTarget); - // env, pos, contId, reload - var reload = $el.data('reload') === true ? true : false; - _openPreview(event.currentTarget, $el.data('kind'), $el.data('position'), $el.data('id'), $el.data('kind')); + var $element = (0, _jquery2.default)(event.currentTarget); + openPreview($element); }).on('click', '.to-open-preview-action', function (event) { event.preventDefault(); - (0, _jquery2.default)('.open-preview-action').trigger("dblclick"); + var $element = (0, _jquery2.default)(event.currentTarget); + openPreview($element); }); $previewContainer.on('click', '.preview-navigate-action', function (event) { event.preventDefault(); @@ -65562,6 +65561,12 @@ var previewRecordService = function previewRecordService(services) { (0, _jquery2.default)("iframe", $sel).css('width', NW).css('height', NH); } + function openPreview($element) { + var reload = $element.data('reload') === true ? true : false; + // env, pos, contId, reload + _openPreview(event.currentTarget, $element.data('kind'), $element.data('position'), $element.data('id'), reload); + } + function closePreview() { options.open = false; if (activeThumbnailFrame !== false) { diff --git a/Phraseanet-production-client/dist/production.min.js b/Phraseanet-production-client/dist/production.min.js index 6d467bf66e..1a5ad15b32 100644 --- a/Phraseanet-production-client/dist/production.min.js +++ b/Phraseanet-production-client/dist/production.min.js @@ -65249,13 +65249,12 @@ var previewRecordService = function previewRecordService(services) { event.preventDefault(); closePreview(); }).on('dblclick', '.open-preview-action', function (event) { - var $el = (0, _jquery2.default)(event.currentTarget); - // env, pos, contId, reload - var reload = $el.data('reload') === true ? true : false; - _openPreview(event.currentTarget, $el.data('kind'), $el.data('position'), $el.data('id'), $el.data('kind')); + var $element = (0, _jquery2.default)(event.currentTarget); + openPreview($element); }).on('click', '.to-open-preview-action', function (event) { event.preventDefault(); - (0, _jquery2.default)('.open-preview-action').trigger("dblclick"); + var $element = (0, _jquery2.default)(event.currentTarget); + openPreview($element); }); $previewContainer.on('click', '.preview-navigate-action', function (event) { event.preventDefault(); @@ -65562,6 +65561,12 @@ var previewRecordService = function previewRecordService(services) { (0, _jquery2.default)("iframe", $sel).css('width', NW).css('height', NH); } + function openPreview($element) { + var reload = $element.data('reload') === true ? true : false; + // env, pos, contId, reload + _openPreview(event.currentTarget, $element.data('kind'), $element.data('position'), $element.data('id'), reload); + } + function closePreview() { options.open = false; if (activeThumbnailFrame !== false) { diff --git a/Phraseanet-production-client/src/components/record/recordPreview/index.js b/Phraseanet-production-client/src/components/record/recordPreview/index.js index ba2066e304..1319781c14 100644 --- a/Phraseanet-production-client/src/components/record/recordPreview/index.js +++ b/Phraseanet-production-client/src/components/record/recordPreview/index.js @@ -81,20 +81,14 @@ const previewRecordService = services => { closePreview(); }) .on('dblclick', '.open-preview-action', event => { - let $el = $(event.currentTarget); - // env, pos, contId, reload - let reload = $el.data('reload') === true ? true : false; - _openPreview( - event.currentTarget, - $el.data('kind'), - $el.data('position'), - $el.data('id'), - $el.data('kind') - ); + let $element = $(event.currentTarget); + openPreview($element); + }) .on('click', '.to-open-preview-action', event => { event.preventDefault(); - $( '.open-preview-action' ).trigger( "dblclick" ); + let $element = $(event.currentTarget); + openPreview($element); }) ; $previewContainer @@ -466,6 +460,18 @@ const previewRecordService = services => { } + function openPreview($element) { + let reload = $element.data('reload') === true ? true : false; + // env, pos, contId, reload + _openPreview( + event.currentTarget, + $element.data('kind'), + $element.data('position'), + $element.data('id'), + reload + ); + } + function closePreview() { options.open = false; if (activeThumbnailFrame !== false) { From 9b9b651b4a890b4392df9e823e9fa8e955e0bd78 Mon Sep 17 00:00:00 2001 From: Moctar Date: Thu, 14 Jan 2021 16:42:16 +0100 Subject: [PATCH 09/16] PHRAS-3336 - add cache clearing and chmod configuration.yml file --- docker/phraseanet/entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/phraseanet/entrypoint.sh b/docker/phraseanet/entrypoint.sh index baa3092ee3..862d4e61b8 100755 --- a/docker/phraseanet/entrypoint.sh +++ b/docker/phraseanet/entrypoint.sh @@ -70,7 +70,8 @@ if [ ${XDEBUG_ENABLED} == "1" ]; then fi ./docker/phraseanet/plugins/console init -#rm -Rf cache/ +rm -Rf cache/* +chmod 600 config/configuration.yml chown -R app:app \ cache \ From 4f4f43e674397032c6a59f877ebe43554399ec77 Mon Sep 17 00:00:00 2001 From: Moctar Date: Thu, 14 Jan 2021 17:29:44 +0100 Subject: [PATCH 10/16] PHRAS-3330 - add datetime to nb_process output --- docker/phraseanet/worker/entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/phraseanet/worker/entrypoint.sh b/docker/phraseanet/worker/entrypoint.sh index d8541e9731..5dc1089962 100755 --- a/docker/phraseanet/worker/entrypoint.sh +++ b/docker/phraseanet/worker/entrypoint.sh @@ -45,7 +45,8 @@ if [ ${PHRASEANET_EXPLODE_WORKER} == "1" ]; then do sleep $WORKER_LOOP_VALUE nb_process=`ps faux | grep "worker:execute" | grep php | wc -l` - echo $nb_process running workers + date_time_process=`date +"%Y-%m-%d %H:%M:%S"` + echo $date_time_process "-" $nb_process "running workers" if [ $nb_process -lt $WORKER_NB_QUEUES ] then exit 1 From 94f6a7077443f1580427a80ec3c49b58deff950f Mon Sep 17 00:00:00 2001 From: Moctar Date: Thu, 14 Jan 2021 17:56:11 +0100 Subject: [PATCH 11/16] PHRAS-3336 reorder .env --- .env | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env b/.env index f191fb418d..dde3312624 100644 --- a/.env +++ b/.env @@ -1,4 +1,5 @@ PHRASEANET_PROJECT_NAME=Phraseanet +PHRASEANET_SERVER_NAME=localhost # Registry from where you pull Docker images PHRASEANET_DOCKER_REGISTRY=local # Tag of the Docker images @@ -59,8 +60,6 @@ PHRASEANET_DB_PASSWORD=root INSTALL_DB_TEMPLATE=DublinCore INSTALL_APPBOX=ab_master INSTALL_DATABOX=db_databox1 -PHRASEANET_SERVER_NAME=localhost - # binaries execution timeouts PHRASEANET_FFMPEG_TIMEOUT=7200 PHRASEANET_FFPROBE_TIMEOUT=120 From e857d28c6fde1e3ce3d049da185ee592d41055c6 Mon Sep 17 00:00:00 2001 From: Moctar Date: Thu, 14 Jan 2021 19:28:19 +0100 Subject: [PATCH 12/16] PHRAS-3336 add messages on entrypoint and phraseanet installation states --- docker/phraseanet/entrypoint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/phraseanet/entrypoint.sh b/docker/phraseanet/entrypoint.sh index 862d4e61b8..8a21e3418e 100755 --- a/docker/phraseanet/entrypoint.sh +++ b/docker/phraseanet/entrypoint.sh @@ -49,7 +49,7 @@ if [ -f "$FILE" ]; then if [[ -n ${PHRASEANET_ADMIN_ACCOUNT_ID} && $PHRASEANET_ADMIN_ACCOUNT_ID =~ ^[0-9]+$ ]]; then bin/console user:password --user_id=$PHRASEANET_ADMIN_ACCOUNT_ID --password $PHRASEANET_ADMIN_ACCOUNT_PASSWORD -y fi - + echo "config/configuration.yml update by Phraseanet entrypoint.sh Finished !" else echo "$FILE doesn't exist, entering setup..." @@ -62,6 +62,7 @@ else datas runuser app -c docker/phraseanet/auto-install.sh + echo "End of Phraseanet Installation" fi if [ ${XDEBUG_ENABLED} == "1" ]; then @@ -88,3 +89,4 @@ fi chown -R app:app datas & bash -e docker-php-entrypoint $@ +echo "Finished runnning Phraseanet entrypoint.sh" \ No newline at end of file From 417b074e5d4391bb5abf008f6c04f765a021cf67 Mon Sep 17 00:00:00 2001 From: Moctar Date: Thu, 14 Jan 2021 19:31:53 +0100 Subject: [PATCH 13/16] PHRAS-3336 add messages on entrypoint and phraseanet installation states and datetime --- docker/phraseanet/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/phraseanet/entrypoint.sh b/docker/phraseanet/entrypoint.sh index 8a21e3418e..0430d9c6b7 100755 --- a/docker/phraseanet/entrypoint.sh +++ b/docker/phraseanet/entrypoint.sh @@ -49,7 +49,7 @@ if [ -f "$FILE" ]; then if [[ -n ${PHRASEANET_ADMIN_ACCOUNT_ID} && $PHRASEANET_ADMIN_ACCOUNT_ID =~ ^[0-9]+$ ]]; then bin/console user:password --user_id=$PHRASEANET_ADMIN_ACCOUNT_ID --password $PHRASEANET_ADMIN_ACCOUNT_PASSWORD -y fi - echo "config/configuration.yml update by Phraseanet entrypoint.sh Finished !" + echo `date +"%Y-%m-%d %H:%M:%S"` " - config/configuration.yml update by Phraseanet entrypoint.sh Finished !" else echo "$FILE doesn't exist, entering setup..." @@ -62,7 +62,7 @@ else datas runuser app -c docker/phraseanet/auto-install.sh - echo "End of Phraseanet Installation" + echo `date +"%Y-%m-%d %H:%M:%S"` " - End of Phraseanet Installation" fi if [ ${XDEBUG_ENABLED} == "1" ]; then @@ -89,4 +89,4 @@ fi chown -R app:app datas & bash -e docker-php-entrypoint $@ -echo "Finished runnning Phraseanet entrypoint.sh" \ No newline at end of file +echo `date +"%Y-%m-%d %H:%M:%S"` " - Finished runnning Phraseanet entrypoint.sh" \ No newline at end of file From ed1cdc63155ecf013a1c434bc9e3b2f54c288c6e Mon Sep 17 00:00:00 2001 From: aina esokia Date: Fri, 15 Jan 2021 12:08:18 +0300 Subject: [PATCH 14/16] PHRAS-3338 detail view add icon in title bar --- Phraseanet-production-client/dist/production.js | 13 ++++++++++++- Phraseanet-production-client/dist/production.min.js | 13 ++++++++++++- .../src/components/record/recordPreview/index.js | 13 ++++++++++++- .../Phrasea/Controller/Prod/RecordController.php | 13 +++++++++++++ lib/classes/record/preview.php | 3 +-- 5 files changed, 50 insertions(+), 5 deletions(-) diff --git a/Phraseanet-production-client/dist/production.js b/Phraseanet-production-client/dist/production.js index 1a5ad15b32..d18157d6ca 100644 --- a/Phraseanet-production-client/dist/production.js +++ b/Phraseanet-production-client/dist/production.js @@ -65498,7 +65498,18 @@ var previewRecordService = function previewRecordService(services) { (0, _jquery2.default)('#PREVIEWBOX img.record.zoomable').draggable(); } - (0, _jquery2.default)('#SPANTITLE').empty().append(data.title); + var basketIcon = ''; + if (data.containerType !== null) { + if (data.containerType === 'feedback') { + basketIcon = ""; + } else if (data.containerType === 'push') { + basketIcon = ""; + } else { + basketIcon = ""; + } + } + + (0, _jquery2.default)('#SPANTITLE').empty().append(basketIcon + data.title); (0, _jquery2.default)('#PREVIEWTITLE_COLLLOGO').empty().append(data.collection_logo); (0, _jquery2.default)('#PREVIEWTITLE_COLLNAME').empty().append(data.databox_name + ' / ' + data.collection_name); diff --git a/Phraseanet-production-client/dist/production.min.js b/Phraseanet-production-client/dist/production.min.js index 1a5ad15b32..d18157d6ca 100644 --- a/Phraseanet-production-client/dist/production.min.js +++ b/Phraseanet-production-client/dist/production.min.js @@ -65498,7 +65498,18 @@ var previewRecordService = function previewRecordService(services) { (0, _jquery2.default)('#PREVIEWBOX img.record.zoomable').draggable(); } - (0, _jquery2.default)('#SPANTITLE').empty().append(data.title); + var basketIcon = ''; + if (data.containerType !== null) { + if (data.containerType === 'feedback') { + basketIcon = ""; + } else if (data.containerType === 'push') { + basketIcon = ""; + } else { + basketIcon = ""; + } + } + + (0, _jquery2.default)('#SPANTITLE').empty().append(basketIcon + data.title); (0, _jquery2.default)('#PREVIEWTITLE_COLLLOGO').empty().append(data.collection_logo); (0, _jquery2.default)('#PREVIEWTITLE_COLLNAME').empty().append(data.databox_name + ' / ' + data.collection_name); diff --git a/Phraseanet-production-client/src/components/record/recordPreview/index.js b/Phraseanet-production-client/src/components/record/recordPreview/index.js index 1319781c14..38b0089fb8 100644 --- a/Phraseanet-production-client/src/components/record/recordPreview/index.js +++ b/Phraseanet-production-client/src/components/record/recordPreview/index.js @@ -381,7 +381,18 @@ const previewRecordService = services => { $('#PREVIEWBOX img.record.zoomable').draggable(); } - $('#SPANTITLE').empty().append(data.title); + let basketIcon = ''; + if (data.containerType !== null ) { + if (data.containerType === 'feedback') { + basketIcon = ""; + } else if (data.containerType === 'push') { + basketIcon = ""; + } else { + basketIcon = ""; + } + } + + $('#SPANTITLE').empty().append(basketIcon + data.title); $('#PREVIEWTITLE_COLLLOGO') .empty() .append(data.collection_logo); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php b/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php index 1c1e6ee250..55f18cc959 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/RecordController.php @@ -103,6 +103,18 @@ class RecordController extends Controller $recordTitle = htmlspecialchars($record->get_title()); } + $containerType = null; + + if ($env === 'BASK') { + if ($record->get_container()->getValidation()) { + $containerType = 'feedback'; + } elseif ($record->get_container()->getPusher()) { + $containerType = 'push'; + } else { + $containerType = 'basket'; + } + } + return $this->app->json([ "desc" => $this->render('prod/preview/caption.html.twig', [ 'record' => $record, @@ -131,6 +143,7 @@ class RecordController extends Controller ]), "pos" => $record->getNumber(), "title" => $recordTitle, + "containerType" => $containerType, "databox_name" => $record->getDatabox()->get_dbname(), "collection_name" => $record->getCollection()->get_name(), "collection_logo" => $record->getCollection()->getLogo($record->getBaseId(), $this->app), diff --git a/lib/classes/record/preview.php b/lib/classes/record/preview.php index dd0ae0fe43..63666f5d7b 100644 --- a/lib/classes/record/preview.php +++ b/lib/classes/record/preview.php @@ -270,8 +270,7 @@ class record_preview extends record_adapter $this->title .= parent::get_title($options); break; case "BASK": - $this->title .= $this->name . ' - ' . parent::get_title($options) - . ' (' . $this->getNumber() . '/' . $this->total . ') '; + $this->title .= $this->name . ' (' . $this->getNumber() . '/' . $this->total . ') - ' . parent::get_title($options); break; case "REG": $title = parent::get_title($options); From 40496b6f2f65ffc44f353a4e6afe2430616b83b2 Mon Sep 17 00:00:00 2001 From: Moctar Date: Fri, 15 Jan 2021 11:47:52 +0100 Subject: [PATCH 15/16] PHRAS-3336 fix mono worker exec errors --- docker/phraseanet/worker/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/phraseanet/worker/entrypoint.sh b/docker/phraseanet/worker/entrypoint.sh index 5dc1089962..2fa3c03a4f 100755 --- a/docker/phraseanet/worker/entrypoint.sh +++ b/docker/phraseanet/worker/entrypoint.sh @@ -54,7 +54,7 @@ if [ ${PHRASEANET_EXPLODE_WORKER} == "1" ]; then fi done ' >> bin/run-worker.sh else - command="bin/console worker:execute --queue-name=$queue_name" + command="bin/console worker:execute" echo $command >> bin/run-worker.sh fi From 5bbad02bc71f57b64b17cd384993150af010af3a Mon Sep 17 00:00:00 2001 From: Moctar Date: Fri, 15 Jan 2021 14:07:51 +0100 Subject: [PATCH 16/16] PHRAS-3336 fix phraseanet entrypoint end message --- docker/phraseanet/entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/phraseanet/entrypoint.sh b/docker/phraseanet/entrypoint.sh index 0430d9c6b7..929d89eabe 100755 --- a/docker/phraseanet/entrypoint.sh +++ b/docker/phraseanet/entrypoint.sh @@ -86,7 +86,7 @@ if [ -d "plugins/" ];then chown -R app:app plugins; fi -chown -R app:app datas & +chown -R app:app datas && echo `date +"%Y-%m-%d %H:%M:%S"` " - Finished chown on datas by entreypoint" & +echo `date +"%Y-%m-%d %H:%M:%S"` " - Finished runnning Phraseanet entrypoint.sh" bash -e docker-php-entrypoint $@ -echo `date +"%Y-%m-%d %H:%M:%S"` " - Finished runnning Phraseanet entrypoint.sh" \ No newline at end of file