PHRAS-3644 fix traefik and 4.1.6-rc2 changelog draft (#4000)

* 4.1.6-rc2 changelog

* 4.1.6-rc2 changelog

* PHRAS-3485 fix traefik under Phrasea

* fixe typo

.env

@@ -143,7 +143,10 @@ PHRASEANET_HOSTNAME=phraseanet.phrasea.local
 
 # Phrasea network Name, the name of Phrasea network and see by traefik
 # @run
-PS_NETWORK_NAME=ps_internal
+PHRASEA_NETWORK_NAME=ps_internal
+
+PHRASEA_DOMAIN=phrasea.local
+PHRASEA_GATEWAY_IP=172.30.0.1
 
 
 # --- Phraseanet container entrypoint settings -------------------------------------------------------------------------

CHANGELOG.md

@@ -1,11 +1,47 @@
 # CHANGELOG
 
+## 4.1.6-rc2
+
+### Update instructions
+
+ - docker docker-compose : add profile "gateway-classic" to your ```COMPOSE_PROFILES```
+ - Migration patch: no patch to play, just run upgrade for bump version 
+ - Elasticsearch index action : Requires a drop, create, populate
+
+### Version summary :
+ 
+  - A new facet named "Thumbnail_orientation" is available in replacement/addition of "_orientation" (based on exif orientation)
+    This facet is based on orientation of generated subdef named "thumbnail". 
+    see section searchengine setting/ aggregate in Admin to activate it.
+    the features require an Elasticsearch index drop, create, populate  
+  - Adding a separate docker-compose profile to nginx container for a better stack compositing
+
+### New Features
+
+```
+PHRAS-3215 Prod - facets -  use image orientation from subdefinition and make a facet of it
+```
+
+### Improvements
+
+```
+PHRAS-3643 Bin/console records:build-subdef add option --publish to emit build message to Rabbitmq
+PHRAS-3653 Worker queue message : publish messages as persistent into rabbitmq queues
+PHRAS-3560 Admin - Users list and search improvement and export users as .csv, add "last connection"
+```
+
+### Bug fix
+
+```
+PHRAS-3651 prod-facets : tech facets "no value" wrongly translated, some always return 0 answers
+ ```
+
 ## 4.1.6-rc1
 
 ### Update instructions
 
  - Migration patch: no patch to play, just run upgrade for bump version 
- - Elasticsearch action : none 
+ - Elasticsearch index action : none 
 
 ### Version summary :
  

README.md

@@ -96,7 +96,7 @@ Get official support : https://www.alchemy.fr/en/rubrique/services/
 
 ## Prerequisites
 
-- docker-compose >=v1.28
+- docker-compose >=v1.29.2
 - docker >=v19.03.13
 
 In the stack Docker, Docker-Compose included in this repo starts by default in test mode. 

doc/infra/compose/phraseanet_traefik.md

@@ -0,0 +1,44 @@
+# Phraseanet under Traefik
+
+Doc status : Beta
+
+Take a look to Traefik documentation 
+
+https://doc.traefik.io/traefik/providers/docker/
+
+## Traekik Provide by Phrasea Stack
+
+Requirement 
+
+- A phrasea stack up.
+
+https://github.com/alchemy-fr/phrasea
+
+Phraseanet stack and Phrasea Stack need to be in separate subnet
+You need to set several Phraseanet's and Phrasea env var for using the Traefik include in Phrasea Stack.
+
+### Phraseanet side 
+
+- Add `docker-compose.under-phrasea.yml` to `COMPOSE_FILES`
+
+- Add `gateway-traefik` and remove `gateway-classic` from `COMPOSE_PROFILES`
+
+- Set `PHRASEA_DOMAIN` with the name of network set Phrasea side 
+
+- Set `PHRASEANET_TRUSTED_PROXIES`  with the phrasea subnet eg: `PHRASEANET_TRUSTED_PROXIES=172.30.0.0/16`
+
+
+### Phrasea side 
+
+- Set `PHRASEANET_BASE_URL` and `PHRASEANET_APP_OAUTH_TOKEN` in accordance of your Phraseanet's setting
+
+
+
+## Traekik provide by Phraseanet Stack
+
+Not implemented
+
+
+
+
+

docker-compose.under-phrasea.yml

@@ -3,9 +3,22 @@ version: "3.9"
 networks:
     phrasea:
       external:
-        name: ${PS_NETWORK_NAME}
+        name: ${PHRASEA_NETWORK_NAME}
+
 services:
   gateway-traefik:
     networks:
+      - internal
       - phrasea
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=${PHRASEA_NETWORK_NAME}"
+      - "traefik.http.routers.phraseanet.rule=Host(`${PHRASEANET_HOSTNAME}`)"
+      - "traefik.http.routers.phraseanet.tls=true"
       
+  phraseanet:
+    extra_hosts:
+      - minio.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP}
+      - api-databox.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP}
+      - databox-indexer.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP}
+      - phraseanet.${PHRASEA_DOMAIN}:${PHRASEA_GATEWAY_IP}

docker-compose.yml

@@ -34,7 +34,7 @@ services:
     networks:
       - internal
 
-  gateway-treafik:
+  gateway-traefik:
     build:
       context: .
       target: phraseanet-nginx
@@ -60,7 +60,6 @@ services:
       - internal
     labels:
       - "traefik.enable=true"
-      - "traefik.docker.network=${PS_NETWORK_NAME}"
       - "traefik.http.routers.phraseanet.rule=Host(`${PHRASEANET_HOSTNAME}`)"
       - "traefik.http.routers.phraseanet.tls=true"