From 5bc66e8f237fd80d041823c41fb6684b8a940d84 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 19 Jul 2019 12:04:19 +0400 Subject: [PATCH 1/4] PHRAS-2671 #comment Fix behaviour of display tooltip #time 4h --- cache/.gitkeep | 0 templates/web/common/preview.html.twig | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 cache/.gitkeep diff --git a/cache/.gitkeep b/cache/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/templates/web/common/preview.html.twig b/templates/web/common/preview.html.twig index b607d6d017..0dba1f0cfd 100644 --- a/templates/web/common/preview.html.twig +++ b/templates/web/common/preview.html.twig @@ -15,7 +15,7 @@ {% set previewHtml5 = null %} -{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') %} +{% if app.getAclForUser(app.getAuthenticatedUser()).has_access_to_subdef(record, 'preview') and record.has_preview == true %} {% set preview_obj = record.get_preview() %} {% else %} {% set preview_obj = record.get_thumbnail() %} From e679f78ed746d8fb73550b208916558f866d0328 Mon Sep 17 00:00:00 2001 From: Alexandre BRACH Date: Fri, 2 Aug 2019 11:15:49 +0200 Subject: [PATCH 2/4] PHRDPL-75 #comment composer-install : update checksum --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9f1821fb6d..7ff718ab2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ - && php -r "if (hash_file('sha384', 'composer-setup.php') === '48e3236262b34d30969dca3c37281b3b4bbe3221bda826ac6a9a62d6444cdb0dcd0615698a5cbe587c3f0fe57a54d8f5') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \ + && php -r "if (hash_file('sha384', 'composer-setup.php') === 'a5c698ffe4b8e849a443b120cd5ba38043260d5c4023dbf93e1558871f1f07f58274fc6f4c93bcfd858c6bd0775cd8d1') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \ && php composer-setup.php --install-dir=/usr/local/bin --filename=composer \ && php -r "unlink('composer-setup.php');" From 3663ace661998b0f0a7e8fd781b9cf7e18ee69fa Mon Sep 17 00:00:00 2001 From: Alexandre BRACH Date: Fri, 2 Aug 2019 12:32:09 +0200 Subject: [PATCH 3/4] PHRDPL-75 #comment update .circleci --- .circleci/config.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7ce9464ae5..28843588b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -124,7 +124,7 @@ workflows: context: "AWS London" create-repo: true dockerfile: Dockerfile - extra-build-args: "--target phraseanet" + extra-build-args: "--target phraseanet-fpm" region: AWS_DEFAULT_REGION repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet" tag: "alpha-0.1" @@ -139,3 +139,14 @@ workflows: region: AWS_DEFAULT_REGION repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet-nginx" 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-worker" + region: AWS_DEFAULT_REGION + repo: "${AWS_RESOURCE_NAME_PREFIX}/phraseanet" + tag: "alpha-0.1" From 640cfc969fc51404f001d257968dbc74ef3029e5 Mon Sep 17 00:00:00 2001 From: aynsix Date: Fri, 16 Aug 2019 14:57:48 +0400 Subject: [PATCH 4/4] fix circleci unable to run the job runner --- .circleci/config.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 28843588b3..ce2f8c9a5c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ jobs: CIRCLE_TEST_REPORTS: /tmp/circleci-test-results docker: - image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37 - command: /sbin/init + - image: circleci/rabbitmq:3.7.7 steps: - checkout - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS @@ -24,10 +24,7 @@ jobs: command: nvm install v10.12.0 && nvm alias default v10.12.0 - run: working_directory: ~/alchemy-fr/Phraseanet - command: 'sudo service memcached status || sudo service memcached start; sudo - redis-cli ping >/dev/null 2>&1 || sudo service redis-server start; sudo - service mysql status || sudo service mysql start; sudo service rabbitmq-server - status || sudo service rabbitmq-server start; ' + command: 'sudo service mysql status || sudo service mysql start;' # Dependencies # This would typically go in either a build or a build-and-test job when using workflows # Restore the dependency cache