Merge branch 'master' into PHRAS-2422_Prod-Highlight_fulltext_is_Nok_when_display_option_is_Graphiste_mode

.circleci/config.yml

@@ -122,7 +122,18 @@ workflows:
                 context: "AWS London"
                 create-repo: true
                 dockerfile: Dockerfile
-                #profile-name: myProfileName
+                extra-build-args: "--target phraseanet"
                 region: AWS_DEFAULT_REGION
                 repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet"
                 tag: "alpha-0.1"
+            - aws-ecr/build_and_push_image:
+                account-url: AWS_ACCOUNT_URL
+                aws-access-key-id: AWS_ACCESS_KEY_ID
+                aws-secret-access-key: AWS_SECRET_ACCESS_KEY
+                context: "AWS London"
+                create-repo: true
+                dockerfile: Dockerfile
+                extra-build-args: "--target phraseanet-nginx"
+                region: AWS_DEFAULT_REGION
+                repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet-nginx"
+                tag: "alpha-0.1"

README.md

@@ -43,4 +43,20 @@ For development with Phraseanet API see https://docs.phraseanet.com/4.0/en/Devel
 Phraseanet is licensed under GPL-v3 license.
 
 
+# Docker build
+
+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.
+
+## How to build
+
+The two images can be built respectively with these two commands :
+
+    # nginx server
+    docker build --target phraseanet-nginx -t phraseanet-nginx .
+
+    # php-fpm application
+    docker build --target phraseanet -t phraseanet .
+