Skip to content

Fix build by renaming apt docker dependency#529

Merged
stefanoborini merged 20 commits into
masterfrom
fix_build
Jun 26, 2017
Merged

Fix build by renaming apt docker dependency#529
stefanoborini merged 20 commits into
masterfrom
fix_build

Conversation

@martinRenou

@martinRenou martinRenou commented Jun 22, 2017

Copy link
Copy Markdown
Member

Apparently something has changed at the docker apt repository, so the result is that the environment setup is compromised.

@codecov-io

codecov-io commented Jun 23, 2017

Copy link
Copy Markdown

Codecov Report

Merging #529 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #529   +/-   ##
=======================================
  Coverage   95.25%   95.25%           
=======================================
  Files          88       88           
  Lines        3961     3961           
  Branches      248      248           
=======================================
  Hits         3773     3773           
  Misses        137      137           
  Partials       51       51

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e90774d...f624877. Read the comment docs.

@stefanoborini stefanoborini changed the title Fix build Fix build by renaming apt docker dependency Jun 26, 2017
Comment thread Makefile Outdated
@@ -11,9 +11,9 @@ venv:
.PHONY: dockerengine
dockerengine:

@stefanoborini stefanoborini Jun 26, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, at this point, I think we should

  • drop this rule, it's no longer relevant. You will also have to remove it from the docs (installation)
  • Remove travis provided docker in the travis yaml file.
  • Have make deps do the docker installation (as it is doing now)
  • Drop support for ubuntu 12, so...

Comment thread Makefile Outdated
`lsb_release -cs` \
stable"
-sudo apt-get -qq update
if [ `lsb_release -rs` = "14.04" ]; then \

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... don't bother with this one, because at this point the standard name is docker-engine for all versions.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kept it because the installed version of python wasn't the same, it is python3.4-venv for trusty and python3-venv for other versions

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok sorry I didn't understand this comment came with the other. I'll do it

Comment thread Makefile Outdated
echo "ERROR: Cannot run on non-Linux systems"; \
false; \
fi
sudo apt-get remove docker docker-engine

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the travis. We don't want to remove a docker installation on the user's machine. if there's already a docker, it will just upgrade it.

@stefanoborini stefanoborini merged commit 7482382 into master Jun 26, 2017
@stefanoborini stefanoborini deleted the fix_build branch June 26, 2017 12:08
@martinRenou martinRenou mentioned this pull request Jul 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants