MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

docker/moby: use generic DOCKER_COMMIT in do_compile

Browse Source 
do_compile() is shared and shouldn't have been using SRCREV_moby
as that is obviously only set in the moby recipe.

Switch to using a generic DOCKER_COMMIT variable and set it in
both docker_moby and docker-ce.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Bruce Ashfield 2022-12-07 16:40:04 -05:00
parent e675e3ebbf
commit d3acb1a378
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-containers/docker/docker-ce_git.bb
View File

@ -45,6 +45,8 @@ SRC_URI = "\
file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \
"
DOCKER_COMMIT = "${SRCREV_docker}"
require docker.inc
# Apache-2.0 for docker

2
recipes-containers/docker/docker-moby_git.bb
View File

@ -48,6 +48,8 @@ SRC_URI = "\
file://0001-dynbinary-use-go-cross-compiler.patch \
"
DOCKER_COMMIT = "${SRCREV_moby}"
require docker.inc
# Apache-2.0 for docker

4
recipes-containers/docker/docker.inc
View File

@ -97,14 +97,14 @@ do_compile() {
# this is the unsupported built structure
# that doesn't rely on an existing docker
# to build this:
VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${SRCREV_moby}" ./hack/make.sh dynbinary
VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${DOCKER_COMMIT}" ./hack/make.sh dynbinary
# build the cli
cd ${S}/src/import/.gopath/src/github.com/docker/cli
export CFLAGS=""
export LDFLAGS=""
export DOCKER_VERSION=${DOCKER_VERSION}
VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${SRCREV_moby}" make dynbinary
VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${DOCKER_COMMIT}" make dynbinary
# build the proxy
cd ${S}/src/import/.gopath/src/github.com/docker/libnetwork