From 9bc2f1ca318fd65f620b4b0c711ac02e4cf616e6 Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 3 Dec 2020 09:45:18 +0100 Subject: [PATCH] Fix zsh for PHP 5.6 and 7.0 --- CHANGELOG.md | 6 ++++++ Dockerfiles/work/Dockerfile-5.6 | 2 +- Dockerfiles/work/Dockerfile-7.0 | 2 +- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8ca350..a1adfad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Unreleased +## Release 0.120 + +#### Fixed +- Fixed `zsh` install for PHP 5.6 and 7.0 + + ## Release 0.119 #### Fixed diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 243d1e3..a7a8df6 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -120,7 +120,7 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - zsh-common=5.3.1-4 \ + zsh-common \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 581bdcb..6b3a566 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -120,7 +120,7 @@ RUN set -eux \ zip \ zlib1g-dev \ zsh \ - zsh-common=5.3.1-4 \ + zsh-common \ && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \ \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index 4874420..6f710dc 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -141,7 +141,7 @@ RUN set -eux \ zlib1g-dev \ zsh \ {% if php_version in [5.6, 7.0] %} - zsh-common=5.3.1-4 \ + zsh-common \ {% endif %} && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \ && rm -rf /var/lib/apt/lists/* \