From 3c0bf41e51930668660ed23faee858e862b43f27 Mon Sep 17 00:00:00 2001 From: Alexandre BRACH Date: Fri, 22 Nov 2019 15:26:22 +0100 Subject: [PATCH 1/5] PHRDPL-81 #comment Use circle env vars CIRCLE_BRANCH to push image with correct tag --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ce2f8c9a5c..8c2b2e1004 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -124,7 +124,7 @@ workflows: extra-build-args: "--target phraseanet-fpm" region: AWS_DEFAULT_REGION repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet" - tag: "alpha-0.1" + tag: "${CIRCLE_BRANCH}" - aws-ecr/build_and_push_image: account-url: AWS_ACCOUNT_URL aws-access-key-id: AWS_ACCESS_KEY_ID @@ -135,7 +135,7 @@ workflows: extra-build-args: "--target phraseanet-nginx" region: AWS_DEFAULT_REGION repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet-nginx" - tag: "alpha-0.1" + tag: "${CIRCLE_BRANCH}" - aws-ecr/build_and_push_image: account-url: AWS_ACCOUNT_URL aws-access-key-id: AWS_ACCESS_KEY_ID @@ -146,4 +146,4 @@ workflows: extra-build-args: "--target phraseanet-worker" region: AWS_DEFAULT_REGION repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet" - tag: "alpha-0.1" + tag: "${CIRCLE_BRANCH}" From 03402cec92ceba462c825faa07359c17af2e1a2f Mon Sep 17 00:00:00 2001 From: Alexandre BRACH Date: Fri, 22 Nov 2019 15:47:31 +0100 Subject: [PATCH 2/5] #comment README instruction to deploy the phraseanet stack --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 751efed810..0105de60fa 100644 --- a/README.md +++ b/README.md @@ -72,3 +72,7 @@ It will build and tag the following images : local/phraseanet-worker: local/phraseanet-fpm: local/phraseanet-nginx: + +# 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. From 6a5678d1b7e2437b66ac43eb0250a62baa5806a8 Mon Sep 17 00:00:00 2001 From: Alexandre BRACH Date: Fri, 22 Nov 2019 16:37:14 +0100 Subject: [PATCH 3/5] PHRDPL-81 #comment remove obsolete param in circuleci.xml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8c2b2e1004..3d02256b3d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -123,7 +123,7 @@ workflows: dockerfile: Dockerfile extra-build-args: "--target phraseanet-fpm" region: AWS_DEFAULT_REGION - repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet" + repo: "phraseanet" tag: "${CIRCLE_BRANCH}" - aws-ecr/build_and_push_image: account-url: AWS_ACCOUNT_URL @@ -134,7 +134,7 @@ workflows: dockerfile: Dockerfile extra-build-args: "--target phraseanet-nginx" region: AWS_DEFAULT_REGION - repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet-nginx" + repo: "phraseanet-nginx" tag: "${CIRCLE_BRANCH}" - aws-ecr/build_and_push_image: account-url: AWS_ACCOUNT_URL @@ -145,5 +145,5 @@ workflows: dockerfile: Dockerfile extra-build-args: "--target phraseanet-worker" region: AWS_DEFAULT_REGION - repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet" + repo: "phraseanet-worker" tag: "${CIRCLE_BRANCH}" From 1ccda42f8d542e188ca2045686fb9f17081d2fde Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Fri, 22 Nov 2019 16:59:16 +0100 Subject: [PATCH 4/5] update repo name --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d02256b3d..3ebc93224a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -123,7 +123,7 @@ workflows: dockerfile: Dockerfile extra-build-args: "--target phraseanet-fpm" region: AWS_DEFAULT_REGION - repo: "phraseanet" + repo: "phraseanet-fpm" tag: "${CIRCLE_BRANCH}" - aws-ecr/build_and_push_image: account-url: AWS_ACCOUNT_URL From 1f5a484a3a155c2ff273376419732498143cb82d Mon Sep 17 00:00:00 2001 From: nmaillat Date: Fri, 22 Nov 2019 22:55:19 +0100 Subject: [PATCH 5/5] PHRAS-2842 #comment change audio codec in databases model #time 1h --- lib/conf.d/data_templates/DublinCore.xml | 2 +- lib/conf.d/data_templates/en-simple.xml | 2 +- lib/conf.d/data_templates/fr-simple.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/conf.d/data_templates/DublinCore.xml b/lib/conf.d/data_templates/DublinCore.xml index 31e874a13d..eae43d5461 100644 --- a/lib/conf.d/data_templates/DublinCore.xml +++ b/lib/conf.d/data_templates/DublinCore.xml @@ -79,7 +79,7 @@ 748 video yes - libfaac + libmp3lame libx264 screen 1000 diff --git a/lib/conf.d/data_templates/en-simple.xml b/lib/conf.d/data_templates/en-simple.xml index 5c5b10910d..44b0afa69f 100644 --- a/lib/conf.d/data_templates/en-simple.xml +++ b/lib/conf.d/data_templates/en-simple.xml @@ -79,7 +79,7 @@ 748 video yes - libfaac + libmp3lame libx264 screen 1000 diff --git a/lib/conf.d/data_templates/fr-simple.xml b/lib/conf.d/data_templates/fr-simple.xml index 49ab36b98d..cc0a2b582c 100644 --- a/lib/conf.d/data_templates/fr-simple.xml +++ b/lib/conf.d/data_templates/fr-simple.xml @@ -79,7 +79,7 @@ 748 video yes - libfaac + libmp3lame libx264 screen 1000