Skip to content
This repository has been archived by the owner on Jul 16, 2020. It is now read-only.

ciao-launcher: Fix docker dependency in ubuntu #509

Merged
merged 1 commit into from
Sep 9, 2016
Merged

ciao-launcher: Fix docker dependency in ubuntu #509

merged 1 commit into from
Sep 9, 2016

Conversation

albertomurillo
Copy link

@albertomurillo albertomurillo commented Sep 1, 2016

The 'docker' package is being installed as a dependency to
get docker insalled in Ubuntu, however, the package needed
is 'docker-engine'

From apt-cache search docker

  • docker - System tray for KDE3/GNOME2 docklet applications
  • docker-engine - Docker: the open-source application container engine

Fixes #508

Signed-off-by: Alberto Murillo [email protected]

@tpepper
Copy link

tpepper commented Sep 1, 2016

Fixes issue #508

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.01%) to 66.4% when pulling 2c25acf on albertomurillo:albertom/docker into c66e905 on 01org:master.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.01%) to 66.4% when pulling 2c25acf on albertomurillo:albertom/docker into c66e905 on 01org:master.

@coveralls
Copy link

coveralls commented Sep 5, 2016

Coverage Status

Coverage decreased (-0.01%) to 66.395% when pulling 4aa249d on albertomurillo:albertom/docker into c895009 on 01org:master.

@markdryan
Copy link
Contributor

markdryan commented Sep 6, 2016

I'm a bit confused by all this.

I thought we were supposed to be pulling docker from apt.dockerproject.org so we get the latest version. If we were to do this, the name of the docker package should be docker-engine and not docker-io.

There seems to be some code in osprepare for handling external repos but it seems incomplete and unused. @tpepper any idea what the status/plan here is? If we merge this patch now we'd get docker 1.10.3 on Ubuntu 16.04 and earlier versions on older version of Ubuntu. I don't think this is what we want.

@tpepper
Copy link

tpepper commented Sep 6, 2016

Yes osprepare does need polished to add ability to install non-distro shipped bits, such as docker.

@tpepper
Copy link

tpepper commented Sep 7, 2016

Despite #509 (comment) I do think the patch here is correct. Osprepare is limited in its ability and needs to do:

if /usr/bin/docker is not present or not at version high enough, then if docker.io in Ubuntu official repo is high enough version then install it, else install docker-engine from apt.dockerproject.org.

@markdryan
Copy link
Contributor

Maybe we should remove docker entirely from the ubuntu install deps for the time being. I seem to remember that we needed a version > 1.10.3. Perhaps @mcastelino could confirm. If this is the case, we could end up having to manually uninstall the docker installed by osprepare before we install the latest version by hand.

@mcastelino
Copy link
Contributor

@markdryan We need docker version 1.10.3 because prior builds have a bug in the network plugin framework. So the ciao docker network plugin will not work with prior releases.

@tpepper
Copy link

tpepper commented Sep 8, 2016

Re: #509 (comment) I think it will be a recurring issue and on each distro. osprepare needs its minversion check added and for docker needs to know how to satisfy a minversion from apt.dockerproject.org if it's not satisfiable from the distro itself.

@tpepper
Copy link

tpepper commented Sep 8, 2016

(which is also to say: osprepare does not function correctly/completely today...I'm working on patches)

@albertomurillo
Copy link
Author

docker.io in Ubuntu is Version: 1.11.2-0ubuntu5~16.04

So I think we can merge this patch until we get the extra code to setup the proper repository and get the proper docker-engine working.

It is better to have docker.io than a KDE applet

@albertomurillo albertomurillo self-assigned this Sep 8, 2016
@markdryan
Copy link
Contributor

@albertomurillo Ubuntu 16.04 has docker 1.10.3. @mcastelino has confirmed that this is good enough to run ciao. The problem is though, what happens if we merge this patch and then we run launcher on a machine that already has docker 1.12 installed from the docker repos. Will we end up with two versions of docker? Will they interfere with each other? Also, installing docker-io isn't much help for those on an earlier version of Ubuntu. I think @tpepper had a suggestion in the bug to change the package name to docker-engine. This will require the user to manually add the docker repos to the sources.list but from then on launcher and osprepre will do the right thing. I vote we do this.

@albertomurillo
Copy link
Author

It doesn't make too much sense to make osprepare install docker-engine while asking
the user to manually add the repository.

The idea of osprepare is that it will install the required pacakges automatically.

If you put as a requirement that the repository has to be manually installed and in other
hand we are also proposing ansible to make the deployment easier, then the logical thing
to do is let ansible install the repository.

Currently, there is a clearlinux.docker role that installs docker repository and docker-engine
in Clearlinux, ubuntu and fedora.

I see two options from here:

  1. Let ansible install docker repository, docker-engine and probably uninstall docker.io
    with the help of clearlinux.docker role and remove docker from osprepare.

  2. Install docker-engine with this patch and make another patch to make osprepare setup
    docker repository and probably uninstall docker.io.

I'm fine with either

@markdryan
Copy link
Contributor

Yes, actually, I was suggesting 2 above. The requirement on users to manually add the docker sources would only be temporary. The plan has always been for osprepare to install things from the docker repos directly. The code's just not ready yet.

@albertomurillo
Copy link
Author

Im updating this PR to cover case #2 then.
And temporary enabling case #1 in ciao-deploy tool

The 'docker' package is being installed as a dependency to
get docker insalled in Ubuntu, however, the package needed
is 'docker-engine'

From apt-cache search docker
docker - System tray for KDE3/GNOME2 docklet applications
docker-engine - Docker: the open-source application container engine

Fixes #508

Signed-off-by: Alberto Murillo <[email protected]>
@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) to 66.407% when pulling 2bfc5be on albertomurillo:albertom/docker into 4e2cb0c on 01org:master.

@coveralls
Copy link

coveralls commented Sep 9, 2016

Coverage Status

Coverage increased (+0.02%) to 66.413% when pulling 2bfc5be on albertomurillo:albertom/docker into 4e2cb0c on 01org:master.

@markdryan markdryan merged commit f09a065 into ciao-project:master Sep 9, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants