From d3acb1a378e644fe2784a8357390b19695640f78 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 7 Dec 2022 16:40:04 -0500 Subject: docker/moby: use generic DOCKER_COMMIT in do_compile 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 --- recipes-containers/docker/docker.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-containers/docker/docker.inc') diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc index b74b4123..2487456e 100644 --- a/recipes-containers/docker/docker.inc +++ b/recipes-containers/docker/docker.inc @@ -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 -- cgit v1.2.3-54-g00ecf