From be588ca396ecdd8347468f605c9ea7c4877fb926 Mon Sep 17 00:00:00 2001 From: Alexandre BRACH Date: Thu, 16 May 2019 17:43:28 +0200 Subject: [PATCH] Docker build instruction in README, circle-ci can build and push the two images --- .circleci/config.yml | 13 ++++++++++++- README.md | 20 ++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c1cadf6605..e5921af091 100644 --- a/.circleci/config.yml +++ b/.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" diff --git a/README.md b/README.md index 8d35f5bfa1..6f0d5c38b5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Phraseanet 4.1 - Digital Asset Management application - RestFull APIS - Elasticsearch search engine - Multiple resolution assets generation - + # Documentation : https://docs.phraseanet.com/ @@ -32,7 +32,7 @@ https://www.phraseanet.com/download/ For development purpose Phraseanet is shipped with ready to use development environments using vagrant. -- git clone +- git clone - vagrant up @@ -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 . +