Merge pull request #185 from devilbox/release-0.120

cytopia · web-flow · commit 7c1ceabf97f5 · 2020-12-04T18:09:38.000+01:00
Release 0.120
diff --git 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
@@ -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
@@ -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
@@ -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/* \

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ RUN set -eux \`
`120`	`120`	`zip \`
`121`	`121`	`zlib1g-dev \`
`122`	`122`	`zsh \`
`123`		`- zsh-common=5.3.1-4 \`
	`123`	`+ zsh-common \`
`124`	`124`	`&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \`
`125`	`125`	`&& rm -rf /var/lib/apt/lists/* \`
`126`	`126`	`\`