Skip to content

Commit

Permalink
Do not check version of docker-squash
Browse files Browse the repository at this point in the history
It's responsibility of user to provide working tools to run
build+test (mentioned in README).

The docker-squash==1.0.5 version is quite old and requires
docker-py module.  Newer python docker related tools use docker
module, which conflicts with docker-py.  So if some new tool is
installed in same environment (for example conu framework) its
requirement docker module overwrites docker-py.

Follow up for 0f93964 and 55d1108.

Fixes: sclorg#100
  • Loading branch information
Marek Skalický authored and praiskup committed Nov 29, 2018
1 parent f1539e9 commit 452fee3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Just run `make check`
Dependencies for testsuite:

- docker
- docker-squash (version 1.0.5)
- docker-squash
- git
- go-md2man
- make
Expand Down
6 changes: 1 addition & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,7 @@ squash ()
local base squashed_from squashed= unsquashed=$IMAGE_ID
test "$SKIP_SQUASH" = 1 && return 0

# FIXME: We have to use the exact versions here to avoid Docker client
# compatibility issues
local squash_version=1.0.5
test "$(docker-squash --version 2>&1)" = "$squash_version" || \
error "docker-squash $squash_version required"
docker-squash --help &>/dev/null || error "docker-squash is required"

if test -f .image-id.squashed; then
squashed=$(cat .image-id.squashed)
Expand Down

0 comments on commit 452fee3

Please sign in to comment.