From 60f68b8a0f4b37196e688ffe4e582a77f16f1b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Denton?= Date: Tue, 12 Mar 2019 17:02:47 -0400 Subject: [PATCH 1/5] fix: Avoid auto-escaping in image component --- packages/components/bolt-image/src/image.twig | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/components/bolt-image/src/image.twig b/packages/components/bolt-image/src/image.twig index 7ab7b93447..26f89b1a2b 100644 --- a/packages/components/bolt-image/src/image.twig +++ b/packages/components/bolt-image/src/image.twig @@ -83,6 +83,11 @@ }} /> {% endset %} +{% set children %} + {{ ext == "jpg" ? imagePlaceholder : "" }} + {{ imageTag }} +{% endset %} + {% block image_content %} {% if width > 0 and height > 0 and useAspectRatio == true %} @@ -90,10 +95,7 @@ attributes: attributes, aspectRatioHeight: height * 1, aspectRatioWidth: width * 1, - children: [ - ext == "jpg" ? imagePlaceholder : "", - imageTag, - ] | join("") + children: children } only %} {% else %} {{ ext == "jpg" ? imagePlaceholder : "" }} From b27b15fe7d261c55a6e88327b5748dd5df64ba98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Denton?= Date: Thu, 14 Mar 2019 13:03:47 -0400 Subject: [PATCH 2/5] Travis troubleshooting --- .travis.yml | 2 ++ Dockerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 74c400aa4d..cea0f658b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,8 +47,10 @@ jobs: # - yarn run build # - yarn run deploy # - sh ./scripts/update-read-only-git-repos.sh @todo: run this only on Bolt releases + - php -m - docker --log-level error pull boltdesignsystem/bolt || true - docker build --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . + - php -m - docker images - echo $DOCKER_HUB_PASS | docker login --username $DOCKER_HUB_USER --password-stdin - GIT_SHA="$(git rev-parse --short HEAD)" diff --git a/Dockerfile b/Dockerfile index ee30a49480..6613e0d91a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM basaltinc/docker-node-php-base:latest # @todo replace with `boltdesignsystem/bolt-docker:latest` once that is configured correctly +RUN sudo apt-get install php7.2-gd + WORKDIR /app COPY . . EXPOSE 3123 From f65b057a4b37da5d426b1108632f2415fbe4a521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Denton?= Date: Thu, 14 Mar 2019 15:06:14 -0400 Subject: [PATCH 3/5] Travis troubleshooting --- .travis.yml | 2 -- Dockerfile | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cea0f658b8..74c400aa4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,10 +47,8 @@ jobs: # - yarn run build # - yarn run deploy # - sh ./scripts/update-read-only-git-repos.sh @todo: run this only on Bolt releases - - php -m - docker --log-level error pull boltdesignsystem/bolt || true - docker build --cache-from boltdesignsystem/bolt --tag boltdesignsystem/bolt . - - php -m - docker images - echo $DOCKER_HUB_PASS | docker login --username $DOCKER_HUB_USER --password-stdin - GIT_SHA="$(git rev-parse --short HEAD)" diff --git a/Dockerfile b/Dockerfile index 6613e0d91a..e24c6e4117 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ FROM basaltinc/docker-node-php-base:latest # @todo replace with `boltdesignsystem/bolt-docker:latest` once that is configured correctly +RUN php -m RUN sudo apt-get install php7.2-gd +RUN echo "extension=.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini +RUN php -m WORKDIR /app COPY . . From 9546479df6f47a3b72759d28e699d17556bfda6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Denton?= Date: Thu, 14 Mar 2019 15:57:02 -0400 Subject: [PATCH 4/5] Travis troubleshooting --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e24c6e4117..9b74b0c7ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM basaltinc/docker-node-php-base:latest # @todo replace with `boltdesignsystem/bolt-docker:latest` once that is configured correctly RUN php -m -RUN sudo apt-get install php7.2-gd +RUN sudo apt-get install --no-install-recommends -y php7.2-gd RUN echo "extension=.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini RUN php -m From b3cadca7c5bfa2d3185367b5b59676a56c668c6a Mon Sep 17 00:00:00 2001 From: Salem Ghoweri Date: Wed, 17 Apr 2019 10:55:37 -0400 Subject: [PATCH 5/5] chore: disable duplicate `prestissimo` composer require + test disabling the php7.2 install that should no longer be needed --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5164fb63cb..e1bb1a84a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM boltdesignsystem/bolt-docker:latest # @todo replace with `boltdesignsystem/bolt-docker:latest` once that is configured correctly -RUN php -m -RUN sudo apt-get install --no-install-recommends -y php7.2-gd -RUN echo "extension=.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini -RUN php -m +# RUN php -m +# RUN sudo apt-get install --no-install-recommends -y php7.2-gd +# RUN echo "extension=.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini +# RUN php -m WORKDIR /app COPY . . EXPOSE 3123 -RUN composer global require hirak/prestissimo +# RUN composer global require hirak/prestissimo RUN yarn run setup RUN yarn run build