hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nicolas Maillat
2019-05-17 10:49:43 +02:00
committed by GitHub
parent 23014279a8 bc812d7b19
commit 0c6385a7bb
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.circleci/config.yml
View File

@@ -122,7 +122,18 @@ workflows:
context: "AWS London" context: "AWS London"
create-repo: true create-repo: true
dockerfile: Dockerfile dockerfile: Dockerfile
#profile-name: myProfileName extra-build-args: "--target phraseanet"
region: AWS_DEFAULT_REGION region: AWS_DEFAULT_REGION
repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet" repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet"
tag: "alpha-0.1" 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"

20
README.md
View File

@@ -9,7 +9,7 @@ Phraseanet 4.1 - Digital Asset Management application
- RestFull APIS - RestFull APIS
- Elasticsearch search engine - Elasticsearch search engine
- Multiple resolution assets generation - Multiple resolution assets generation
# Documentation : # Documentation :
https://docs.phraseanet.com/ 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. For development purpose Phraseanet is shipped with ready to use development environments using vagrant.
- git clone - git clone
- vagrant up - 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. 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 .