Skip to contentSkip to conversation

docker-ce: improve hardcoded CC for cross compile

PATCH Superseded Stefan Agner 2 participants 7 messages Aug 30, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 docker-ce: improve hardcoded CC for cross compile

From: Stefan Agner <[email protected]>

Since commit applied in moby [61a3285 Support cross-compile for arm] it hardcoded var-CC to support cross-compile for arm

Correct it with "${parameter:-word}" format, it is helpful for user define toolchains

(Use Default Values. If parameter is unset or null, the expansion of word is substituted. Otherwise, the value of parameter is substituted.)

https://github.com/moby/moby/commit/61a3285864d3f1b489f48f765b61b2c7bd300372

This fixes a build issue seen when building docker-ce:
exec: "aarch64-linux-gnu-gcc": executable file not found in $PATH

---
 recipes-containers/docker/docker-ce_git.bb    |  1 +
 ...dcoded-CC-on-cross-compile-docker-ce.patch | 61 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 recipes-containers/docker/files/0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch
recipes-containers/docker/docker-ce_git.bb +1 -0
index a3e27a5..215f114 100644
@@ -25,6 +25,7 @@ SRC_URI = "\
 	git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \
 	file://0001-libnetwork-use-GO-instead-of-go.patch \
 	file://docker.init \
+	file://0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch \
 	"
 
 require docker.inc
recipes-containers/docker/files/0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch new file +61 -0

61 lines not on this page · raw message

Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/3 docker-ce: update to v19.03.2-rc1

From: Stefan Agner <[email protected]>

Bump the git hashes to Docker CE v19.03.2-rc1.

---
 recipes-containers/docker/docker-ce_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-containers/docker/docker-ce_git.bb +2 -2
index 215f114..9018d7a 100644
@@ -18,7 +18,7 @@ DESCRIPTION = "Linux container runtime \
  subtle and/or glaring issues. \
  "
 
-SRCREV_docker = "2416d7f930859912c883f964b1cee6909635f951"
+SRCREV_docker = "8296f90eef33e5d30c4521ff6001b9600b4de78f"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
 SRC_URI = "\
 	git://github.com/docker/docker-ce.git;branch=19.03;name=docker \
@@ -38,7 +38,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3-ce"
+DOCKER_VERSION = "19.03.2-rc1-ce"
 PV = "${DOCKER_VERSION}+git${SRCREV_docker}"
 
 PACKAGES =+ "${PN}-contrib"
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/3 docker: update to v19.03.2-rc1

In reply to Stefan Agner

From: Stefan Agner <[email protected]>

Use the docker/engine fork of moby which provides a stabilized version of moby in its 19.03 branch.

Bump all git hashes to what is used in Docker CE v19.03.2-rc1. The SRCREVs are selected through an audit of moby and docker-ce to synchronize the build points for the various components.

---
 recipes-containers/docker/docker_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-containers/docker/docker_git.bb +4 -4
index e45f87e..3892c65 100644
@@ -35,11 +35,11 @@ DESCRIPTION = "Linux container runtime \
 #     to a docker.inc recipe
 
 # moby commit matches the docker-ce swarmkit bump on the 18.09 branch
-SRCREV_moby = "344b093258fcb2195fa393081e5224a6c766c798"
+SRCREV_moby = "ed20165a37b40ff1cfbe55e218344c5e89f30ee2"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
-SRCREV_cli = "2f1931f9eb2d6bac2efd48d94739f2e9919d4d7d"
+SRCREV_cli = "578ab52ece34b084621954e0b543003410cdbe84"
 SRC_URI = "\
-	git://github.com/moby/moby.git;nobranch=1;name=moby \
+	git://github.com/docker/engine.git;branch=19.03;name=moby \
 	git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \
 	git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \
 	file://docker.init \
@@ -57,7 +57,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3"
+DOCKER_VERSION = "19.03.2-rc1"
 PV = "${DOCKER_VERSION}+git${SRCREV_moby}"
 
 PACKAGES =+ "${PN}-contrib"
Signature · 1 line
2.20.1
#3 lore raw

Re: [PATCH 3/3] docker: update to v19.03.2-rc1

Quoted 5 lines · Stefan Agner

From: Stefan Agner <[email protected]>

Use the docker/engine fork of moby which provides a stabilized version of moby in its 19.03 branch.

I've mentioned before, this recipe really is going to stay on moby, not a curated version of moby or anything like that.

I already have some queued updated to docker here, so I'll take care of updating this recipe and stack your other patches on top.

Bruce

Quoted 46 lines

Bump all git hashes to what is used in Docker CE v19.03.2-rc1. The SRCREVs are selected through an audit of moby and docker-ce to synchronize the build points for the various components.

---
 recipes-containers/docker/docker_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-containers/docker/docker_git.bb +4 -5
index e45f87e..3892c65 100644
@@ -35,11 +35,11 @@ DESCRIPTION = "Linux container runtime \
 #     to a docker.inc recipe
 
 # moby commit matches the docker-ce swarmkit bump on the 18.09 branch
-SRCREV_moby = "344b093258fcb2195fa393081e5224a6c766c798"
+SRCREV_moby = "ed20165a37b40ff1cfbe55e218344c5e89f30ee2"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
-SRCREV_cli = "2f1931f9eb2d6bac2efd48d94739f2e9919d4d7d"
+SRCREV_cli = "578ab52ece34b084621954e0b543003410cdbe84"
 SRC_URI = "\
-       git://github.com/moby/moby.git;nobranch=1;name=moby \
+       git://github.com/docker/engine.git;branch=19.03;name=moby \
        git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \
        git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \
        file://docker.init \
@@ -57,7 +57,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3"
+DOCKER_VERSION = "19.03.2-rc1"
 PV = "${DOCKER_VERSION}+git${SRCREV_moby}"
 
 PACKAGES =+ "${PN}-contrib"
--

2.20.1

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#4 lore raw

Re: [PATCH 3/3] docker: update to v19.03.2-rc1

Quoted 9 lines · Bruce Ashfield
Quoted 5 lines · Stefan Agner

From: Stefan Agner <[email protected]>

Use the docker/engine fork of moby which provides a stabilized version of moby in its 19.03 branch.

I've mentioned before, this recipe really is going to stay on moby, not a curated version of moby or anything like that.

Hm, I guess you refer to:
https://lists.yoctoproject.org/pipermail/meta-virtualization/2019-March/004068.html

Generally I see your argumentation, and I think it is good to try to build a recipe which tracks Dockers upstream projects.

However, I really don't think its a good idea to build from moby directly since it has no proper release process.

IMHO, moby is more -dev branch rather than anything a OE recipe should rely on. I tried first finding what matches best the Docker version "19.03.2-rc1" in Moby, but since this is really a development branch its not possible to pick a matching (or close to matching) git commit.

docker/engine is really just a fork with a proper release process. We get cli and libnetwork also from the Docker company repos...

The fact that this recipe has the name "docker" and follows the docker versioning, I really think it is more reasonable to track
https://github.com/docker/engine.

Btw, the reason I started investigate was that I see quite often errors like this with the current version:
docker: Error response from daemon: OCI runtime create failed:
container_linux.go:345: starting container process caused "process_linux.go:299: copying bootstrap data to pipe caused \"write
init-p: broken pipe\"": unknown.

--
Stefan

Quoted 52 lines

I already have some queued updated to docker here, so I'll take care of updating this recipe and stack your other patches on top.

Bruce

Quoted 46 lines

Bump all git hashes to what is used in Docker CE v19.03.2-rc1. The SRCREVs are selected through an audit of moby and docker-ce to synchronize the build points for the various components.

---
 recipes-containers/docker/docker_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-containers/docker/docker_git.bb +4 -5
index e45f87e..3892c65 100644
@@ -35,11 +35,11 @@ DESCRIPTION = "Linux container runtime \
 #     to a docker.inc recipe
 
 # moby commit matches the docker-ce swarmkit bump on the 18.09 branch
-SRCREV_moby = "344b093258fcb2195fa393081e5224a6c766c798"
+SRCREV_moby = "ed20165a37b40ff1cfbe55e218344c5e89f30ee2"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
-SRCREV_cli = "2f1931f9eb2d6bac2efd48d94739f2e9919d4d7d"
+SRCREV_cli = "578ab52ece34b084621954e0b543003410cdbe84"
 SRC_URI = "\
-       git://github.com/moby/moby.git;nobranch=1;name=moby \
+       git://github.com/docker/engine.git;branch=19.03;name=moby \
        git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \
        git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \
        file://docker.init \
@@ -57,7 +57,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3"
+DOCKER_VERSION = "19.03.2-rc1"
 PV = "${DOCKER_VERSION}+git${SRCREV_moby}"
 
 PACKAGES =+ "${PN}-contrib"
--

2.20.1

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

#5 lore raw

Re: [PATCH 3/3] docker: update to v19.03.2-rc1

Quoted 12 lines · Stefan Agner
Quoted 9 lines · Bruce Ashfield
Quoted 5 lines · Stefan Agner

From: Stefan Agner <[email protected]>

Use the docker/engine fork of moby which provides a stabilized version of moby in its 19.03 branch.

I've mentioned before, this recipe really is going to stay on moby, not a curated version of moby or anything like that.

Quoted 8 lines

Hm, I guess you refer to:
https://lists.yoctoproject.org/pipermail/meta-virtualization/2019-March/004068.html

Generally I see your argumentation, and I think it is good to try to build a recipe which tracks Dockers upstream projects.

However, I really don't think its a good idea to build from moby directly since it has no proper release process.

That's actually what the point of that recipe is, it's tracking -dev completely.

Quoted 8 lines

IMHO, moby is more -dev branch rather than anything a OE recipe should rely on. I tried first finding what matches best the Docker version "19.03.2-rc1" in Moby, but since this is really a development branch its not possible to pick a matching (or close to matching) git commit.

docker/engine is really just a fork with a proper release process. We get cli and libnetwork also from the Docker company repos...

Yes, but there's docker-ce for folks that want to follow all the docker repos. I don't actually think we need the cli/libnetwork in that recipe anymore, but I haven't had
time to experiment.

Quoted 4 lines

The fact that this recipe has the name "docker" and follows the docker versioning, I really think it is more reasonable to track
https://github.com/docker/engine.

Yah, that is a problem. I need to just get on with it and rename the recipe moby. I said I was going to do it in the spring, but perhaps I'll just do it this weekend instead.

The problem is, a lot of things (and layers I don't know about) currently depend on "docker" not "virtual/docker" as I mentioned in my various other email, so I really need to create a 3rd recipe that follows the docker engine .. but it really is just a placeholder, since it isn't different than docker-ce on any significant level. It probably leaves me as the only 'moby' user at that point, but that's ok too :D

i.e. I'd end up with "moby", "docker" and "docker-ce".

I could do that for the fall release and then clean things up in the spring.

Comments ? How does that sound ?

Quoted 7 lines

Btw, the reason I started investigate was that I see quite often errors like this with the current version:
docker: Error response from daemon: OCI runtime create failed:
container_linux.go:345: starting container process caused "process_linux.go:299: copying bootstrap data to pipe caused \"write
init-p: broken pipe\"": unknown.

Hmmm. I've never seen that here and I tend to stress things pretty heavily in the systems that I build. I assume you aren't seeing it with docker-ce ?

Bruce

Quoted 58 lines

--
Stefan

Quoted 52 lines

I already have some queued updated to docker here, so I'll take care of updating this recipe and stack your other patches on top.

Bruce

Quoted 46 lines

Bump all git hashes to what is used in Docker CE v19.03.2-rc1. The SRCREVs are selected through an audit of moby and docker-ce to synchronize the build points for the various components.

---
 recipes-containers/docker/docker_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-containers/docker/docker_git.bb +4 -5
index e45f87e..3892c65 100644
@@ -35,11 +35,11 @@ DESCRIPTION = "Linux container runtime \
 #     to a docker.inc recipe
 
 # moby commit matches the docker-ce swarmkit bump on the 18.09 branch
-SRCREV_moby = "344b093258fcb2195fa393081e5224a6c766c798"
+SRCREV_moby = "ed20165a37b40ff1cfbe55e218344c5e89f30ee2"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
-SRCREV_cli = "2f1931f9eb2d6bac2efd48d94739f2e9919d4d7d"
+SRCREV_cli = "578ab52ece34b084621954e0b543003410cdbe84"
 SRC_URI = "\
-       git://github.com/moby/moby.git;nobranch=1;name=moby \
+       git://github.com/docker/engine.git;branch=19.03;name=moby \
        git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \
        git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \
        file://docker.init \
@@ -57,7 +57,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3"
+DOCKER_VERSION = "19.03.2-rc1"
 PV = "${DOCKER_VERSION}+git${SRCREV_moby}"
 
 PACKAGES =+ "${PN}-contrib"
--

2.20.1

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#6 lore raw

Re: [PATCH 3/3] docker: update to v19.03.2-rc1

Quoted 16 lines · Bruce Ashfield
Quoted 15 lines · Stefan Agner
Quoted 9 lines · Bruce Ashfield
Quoted 5 lines · Stefan Agner

From: Stefan Agner <[email protected]>

Use the docker/engine fork of moby which provides a stabilized version of moby in its 19.03 branch.

I've mentioned before, this recipe really is going to stay on moby, not a curated version of moby or anything like that.

Hm, I guess you refer to:
https://lists.yoctoproject.org/pipermail/meta-virtualization/2019-March/004068.html

Quoted 8 lines
Quoted 5 lines

Generally I see your argumentation, and I think it is good to try to build a recipe which tracks Dockers upstream projects.

However, I really don't think its a good idea to build from moby directly since it has no proper release process.

That's actually what the point of that recipe is, it's tracking -dev completely.

Ok.

Quoted 6 lines
Quoted 6 lines

IMHO, moby is more -dev branch rather than anything a OE recipe should rely on. I tried first finding what matches best the Docker version "19.03.2-rc1" in Moby, but since this is really a development branch its not possible to pick a matching (or close to matching) git commit.

Quoted 8 lines
Quoted 2 lines

docker/engine is really just a fork with a proper release process. We get cli and libnetwork also from the Docker company repos...

Yes, but there's docker-ce for folks that want to follow all the docker repos. I don't actually think we need the cli/libnetwork in that recipe anymore, but I haven't had
time to experiment.

Hm, yeah I was wondering about that too. But should be looked at properly I guess.

Quoted 17 lines
Quoted 4 lines

The fact that this recipe has the name "docker" and follows the docker versioning, I really think it is more reasonable to track
https://github.com/docker/engine.

Yah, that is a problem. I need to just get on with it and rename the recipe moby. I said I was going to do it in the spring, but perhaps I'll just do it this weekend instead.

The problem is, a lot of things (and layers I don't know about) currently depend on "docker" not "virtual/docker" as I mentioned in my various other email, so I really need to create a 3rd recipe that follows the docker engine .. but it really is just a placeholder, since it isn't different than docker-ce on any significant level. It probably leaves me as the only 'moby' user at that point, but that's ok too :D

Quoted 6 lines

i.e. I'd end up with "moby", "docker" and "docker-ce".

I could do that for the fall release and then clean things up in the spring.

Comments ? How does that sound ?

Yes I really think the naming would resolve this confusion nicely. I agree splitting up to moby, docker and docker-ce seems sensible.

Quoted 11 lines
Quoted 7 lines

Btw, the reason I started investigate was that I see quite often errors like this with the current version:
docker: Error response from daemon: OCI runtime create failed:
container_linux.go:345: starting container process caused "process_linux.go:299: copying bootstrap data to pipe caused \"write
init-p: broken pipe\"": unknown.

Hmmm. I've never seen that here and I tend to stress things pretty heavily in the systems that I build. I assume you aren't seeing it with docker-ce ?

I was not able to find a command (combination) which makes it always reproducible, so it seems to be a race condition of some sort. I haven't tested with docker-ce. I think I mostly saw it on our lower end devices (Cortex-A7).

Given we are dealing with a pre-release I thought its not worth further investigate but just move to the release and then keep an eye on it.

--
Stefan

Quoted 61 lines

Bruce

Quoted 58 lines

--
Stefan

Quoted 52 lines

I already have some queued updated to docker here, so I'll take care of updating this recipe and stack your other patches on top.

Bruce

Quoted 46 lines

Bump all git hashes to what is used in Docker CE v19.03.2-rc1. The SRCREVs are selected through an audit of moby and docker-ce to synchronize the build points for the various components.

---
 recipes-containers/docker/docker_git.bb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-containers/docker/docker_git.bb +4 -5
index e45f87e..3892c65 100644
@@ -35,11 +35,11 @@ DESCRIPTION = "Linux container runtime \
 #     to a docker.inc recipe
 
 # moby commit matches the docker-ce swarmkit bump on the 18.09 branch
-SRCREV_moby = "344b093258fcb2195fa393081e5224a6c766c798"
+SRCREV_moby = "ed20165a37b40ff1cfbe55e218344c5e89f30ee2"
 SRCREV_libnetwork = "5ac07abef4eee176423fdc1b870d435258e2d381"
-SRCREV_cli = "2f1931f9eb2d6bac2efd48d94739f2e9919d4d7d"
+SRCREV_cli = "578ab52ece34b084621954e0b543003410cdbe84"
 SRC_URI = "\
-       git://github.com/moby/moby.git;nobranch=1;name=moby \
+       git://github.com/docker/engine.git;branch=19.03;name=moby \
        git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=git/libnetwork \
        git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \
        file://docker.init \
@@ -57,7 +57,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-DOCKER_VERSION = "19.03.0-rc3"
+DOCKER_VERSION = "19.03.2-rc1"
 PV = "${DOCKER_VERSION}+git${SRCREV_moby}"
 
 PACKAGES =+ "${PN}-contrib"
--

2.20.1

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization