Merge branch 'master' into PHRAS-4042-fix-expose-webvtt-field

alchemy-fr · May 15, 2024 · 094ccc3 · 094ccc3
2 parents b50eb61 + 9f77c2c
commit 094ccc3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git 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
@@ -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 \

diff --git a/templates/web/admin/worker-manager/index.html.twig b/templates/web/admin/worker-manager/index.html.twig
@@ -6,7 +6,7 @@
         <ul class="nav nav-tabs" id="configurationTabs">
 
             <li class="worker-info" role="presentation">
-                <a href="#worker-info" aria-controls="worker-info" role="tab" data-toggle="tab" data-url="/admin/worker-manager/info?running=1">
+                <a href="#worker-info" aria-controls="worker-info" role="tab" data-toggle="tab" data-url="/admin/worker-manager/info?running=1&timeFilter=P3D">
                     {{ 'admin::workermanager:tab:workerinfo: title' |trans }}
                 </a>
             </li>

diff --git a/templates/web/admin/worker-manager/worker_info.html.twig b/templates/web/admin/worker-manager/worker_info.html.twig
@@ -62,11 +62,11 @@
                 <a data-value="PT3H">{{ '3h' | trans }}</a>-
                 <a data-value="PT12H">{{ '12h' | trans }}</a>-
                 <a data-value="P1D">{{ '1d' | trans }}</a>-
-                <a data-value="P3D">{{ '3d' | trans }}</a>-
+                <a data-value="P3D" class="active">{{ '3d' | trans }}</a>-
                 <a data-value="P7D">{{ '1w' | trans }}</a>-
                 <a data-value="P14D">{{ '2w' | trans }}</a>-
                 <a data-value="P1M">{{ '1m' | trans }}</a>-
-                <a data-value="" class="active">{{ 'all' | trans }}</a>
+                <a data-value="">{{ 'all' | trans }}</a>
             </span>
             <span class="real-entry-duration" style="color:#2d7979;">{{ realEntryDuration }}</span>
         </div>