From bcc581fb649e37ba782edbeba80b0c5681d028ed Mon Sep 17 00:00:00 2001
From: Aina Sitraka <35221835+aynsix@users.noreply.github.com>
Date: Wed, 15 May 2024 21:38:47 +0300
Subject: [PATCH 1/2] default filter since 3 days (#4507)
---
templates/web/admin/worker-manager/index.html.twig | 2 +-
templates/web/admin/worker-manager/worker_info.html.twig | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/templates/web/admin/worker-manager/index.html.twig b/templates/web/admin/worker-manager/index.html.twig
index fa9ef1ab76..3290a838b9 100644
--- a/templates/web/admin/worker-manager/index.html.twig
+++ b/templates/web/admin/worker-manager/index.html.twig
@@ -6,7 +6,7 @@
-
-
+
{{ 'admin::workermanager:tab:workerinfo: title' |trans }}
diff --git a/templates/web/admin/worker-manager/worker_info.html.twig b/templates/web/admin/worker-manager/worker_info.html.twig
index 38cde51f33..015862aba8 100644
--- a/templates/web/admin/worker-manager/worker_info.html.twig
+++ b/templates/web/admin/worker-manager/worker_info.html.twig
@@ -62,11 +62,11 @@
{{ '3h' | trans }}-
{{ '12h' | trans }}-
{{ '1d' | trans }}-
- {{ '3d' | trans }}-
+ {{ '3d' | trans }}-
{{ '1w' | trans }}-
{{ '2w' | trans }}-
{{ '1m' | trans }}-
- {{ 'all' | trans }}
+ {{ 'all' | trans }}
{{ realEntryDuration }}
From 9f77c2cbbe829f637f0c70e2c4eb6db21a4de78c Mon Sep 17 00:00:00 2001
From: moctardiouf
Date: Wed, 15 May 2024 22:08:49 +0200
Subject: [PATCH 2/2] PHRAS-4064-fix-worker-plugin-install-as-app (#4508)
---
Dockerfile | 7 ++++++-
docker/phraseanet/worker/entrypoint.sh | 5 +++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 5bd8e5ff6a..f6133a69fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -97,7 +97,12 @@ CMD ["php-fpm", "-F"]
# Phraseanet worker application image
#########################################################################
-FROM phraseanet-fpm as phraseanet-worker
+FROM alchemyfr/phraseanet-base:1.0.0 as phraseanet-worker
+
+COPY --from=builder --chown=app /var/alchemy/Phraseanet /var/alchemy/Phraseanet
+ADD ./docker/phraseanet/root /
+WORKDIR /var/alchemy/Phraseanet
+
RUN apt-get update
RUN apt-get install -y --no-install-recommends supervisor
RUN apt-get install -y --no-install-recommends logrotate
diff --git a/docker/phraseanet/worker/entrypoint.sh b/docker/phraseanet/worker/entrypoint.sh
index 4fdf1b827f..afe92889d5 100755
--- a/docker/phraseanet/worker/entrypoint.sh
+++ b/docker/phraseanet/worker/entrypoint.sh
@@ -27,6 +27,11 @@ fi
chown -R app:app cache
echo `date +"%Y-%m-%d %H:%M:%S"` " - chown app:app on cache/ repository"
+if [ -d "www/plugins/" ];then
+chown -R app:app www/plugins
+echo `date +"%Y-%m-%d %H:%M:%S"` " - chown app:app on plugins/ repository"
+fi
+
# config \
# tmp \
# logs \