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

Merge branch 'master' into PHRAS-2796_actionbar-enhancements_4.1

Browse Source
This commit is contained in:
jygaulier
2019-11-25 14:47:45 +01:00
committed by GitHub
parent ac45c47ca2 3b8163e98c
commit 2aef7273eb
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.circleci/config.yml
View File

@@ -123,8 +123,8 @@ workflows:
dockerfile: Dockerfile dockerfile: Dockerfile
extra-build-args: "--target phraseanet-fpm" extra-build-args: "--target phraseanet-fpm"
region: AWS_DEFAULT_REGION region: AWS_DEFAULT_REGION
repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet" repo: "phraseanet-fpm"
tag: "alpha-0.1" tag: "${CIRCLE_BRANCH}"
- aws-ecr/build_and_push_image: - aws-ecr/build_and_push_image:
account-url: AWS_ACCOUNT_URL account-url: AWS_ACCOUNT_URL
aws-access-key-id: AWS_ACCESS_KEY_ID aws-access-key-id: AWS_ACCESS_KEY_ID
@@ -134,8 +134,8 @@ workflows:
dockerfile: Dockerfile dockerfile: Dockerfile
extra-build-args: "--target phraseanet-nginx" extra-build-args: "--target phraseanet-nginx"
region: AWS_DEFAULT_REGION region: AWS_DEFAULT_REGION
repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet-nginx" repo: "phraseanet-nginx"
tag: "alpha-0.1" tag: "${CIRCLE_BRANCH}"
- aws-ecr/build_and_push_image: - aws-ecr/build_and_push_image:
account-url: AWS_ACCOUNT_URL account-url: AWS_ACCOUNT_URL
aws-access-key-id: AWS_ACCESS_KEY_ID aws-access-key-id: AWS_ACCESS_KEY_ID
@@ -145,5 +145,5 @@ workflows:
dockerfile: Dockerfile dockerfile: Dockerfile
extra-build-args: "--target phraseanet-worker" extra-build-args: "--target phraseanet-worker"
region: AWS_DEFAULT_REGION region: AWS_DEFAULT_REGION
repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet" repo: "phraseanet-worker"
tag: "alpha-0.1" tag: "${CIRCLE_BRANCH}"

4
README.md
View File

@@ -72,3 +72,7 @@ It will build and tag the following images :
local/phraseanet-worker:<TAG> local/phraseanet-worker:<TAG>
local/phraseanet-fpm:<TAG> local/phraseanet-fpm:<TAG>
local/phraseanet-nginx:<TAG> local/phraseanet-nginx:<TAG>
# Deploy the application
Once the images are built, you can deploy the entire phraseanet stack using the repository : https://github.com/alchemy-fr/phraseanet-docker and follow the instruction inside its `README.md` file.

2
lib/conf.d/data_templates/DublinCore.xml
View File

@@ -79,7 +79,7 @@
<size>748</size> <size>748</size>
<mediatype>video</mediatype> <mediatype>video</mediatype>
<writeDatas>yes</writeDatas> <writeDatas>yes</writeDatas>
<acodec>libfaac</acodec> <acodec>libmp3lame</acodec>
<vcodec>libx264</vcodec> <vcodec>libx264</vcodec>
<devices>screen</devices> <devices>screen</devices>
<bitrate>1000</bitrate> <bitrate>1000</bitrate>

2
lib/conf.d/data_templates/en-simple.xml
View File

@@ -79,7 +79,7 @@
<size>748</size> <size>748</size>
<mediatype>video</mediatype> <mediatype>video</mediatype>
<writeDatas>yes</writeDatas> <writeDatas>yes</writeDatas>
<acodec>libfaac</acodec> <acodec>libmp3lame</acodec>
<vcodec>libx264</vcodec> <vcodec>libx264</vcodec>
<devices>screen</devices> <devices>screen</devices>
<bitrate>1000</bitrate> <bitrate>1000</bitrate>

2
lib/conf.d/data_templates/fr-simple.xml
View File

@@ -79,7 +79,7 @@
<size>748</size> <size>748</size>
<mediatype>video</mediatype> <mediatype>video</mediatype>
<writeDatas>yes</writeDatas> <writeDatas>yes</writeDatas>
<acodec>libfaac</acodec> <acodec>libmp3lame</acodec>
<vcodec>libx264</vcodec> <vcodec>libx264</vcodec>
<devices>screen</devices> <devices>screen</devices>
<bitrate>1000</bitrate> <bitrate>1000</bitrate>