Skip to content
This repository has been archived by the owner on Jan 11, 2019. It is now read-only.

Commit

Permalink
🚑 Fixes the squash option working ass-backwards (#33)
Browse files Browse the repository at this point in the history
* 🚑 Fixes the squash option working ass-backwards

* 📚 Updated CHANGELOG for release v0.3.2
  • Loading branch information
frenck authored Sep 25, 2017
1 parent 59fcb12 commit ed6e3be
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning][semantic-versioning].

No unreleased changes yet.

## [v0.3.2][v0.3.2] (2017-09-26)

[Full Changelog][v0.3.1-v0.3.2]

### Fixed

- Fixed squash, true/false mixup [#33][33]

## [v0.3.1][v0.3.1] (2017-09-26)

[Full Changelog][v0.3.0-v0.3.1]
Expand Down Expand Up @@ -181,6 +189,7 @@ No unreleased changes yet.
[3]: https://github.com/hassio-addons/build-env/pull/3
[31]: https://github.com/hassio-addons/build-env/pull/31
[32]: https://github.com/hassio-addons/build-env/pull/32
[33]: https://github.com/hassio-addons/build-env/pull/33
[4]: https://github.com/hassio-addons/build-env/pull/4
[6]: https://github.com/hassio-addons/build-env/pull/6
[8]: https://github.com/hassio-addons/build-env/pull/8
Expand Down Expand Up @@ -213,4 +222,6 @@ No unreleased changes yet.
[v0.2.1]: https://github.com/hassio-addons/build-env/tree/v0.2.1
[v0.3.0-v0.3.1]: https://github.com/hassio-addons/build-env/compare/v0.3.0...v0.3.1
[v0.3.0]: https://github.com/hassio-addons/build-env/tree/v0.3.0
[v0.3.1-v0.3.2]: https://github.com/hassio-addons/build-env/compare/v0.3.1...v0.3.2
[v0.3.1]: https://github.com/hassio-addons/build-env/tree/v0.3.1
[v0.3.2]: https://github.com/hassio-addons/build-env/tree/v0.3.2
2 changes: 1 addition & 1 deletion build-env/rootfs/usr/bin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ get_info_json() {
done <<< "${archs}"

if [[ -z "${DOCKER_SQUASH:-}" ]]; then
squash=$(jq -r '.squash | not' "${jsonfile}")
squash=$(jq -r '.squash | not | not' "${jsonfile}")
[[ "${squash}" = true ]] && DOCKER_SQUASH=true
[[ "${squash}" = false ]] && DOCKER_SQUASH=false
fi
Expand Down

0 comments on commit ed6e3be

Please sign in to comment.