mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-23 18:03:17 +00:00
Merge branch 'master' into PHRAS-2628_toolbar-plugin_4.1
This commit is contained in:
@@ -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
|
||||
|
13
README.md
13
README.md
@@ -56,18 +56,21 @@ 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 .
|
||||
|
||||
# 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 .
|
||||
|
||||
|
3
docker/phraseanet/worker-boot.sh
Executable file
3
docker/phraseanet/worker-boot.sh
Executable file
@@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
runuser app -c 'php /var/alchemy/Phraseanet/bin/console task-manager:scheduler:run'
|
@@ -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,
|
||||
|
Reference in New Issue
Block a user