3 files changed, 6 insertions, 2 deletions

diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
index bfe4f909..0e34bb61 100644
--- a/recipes-containers/docker/docker-ce_git.bb
+++ b/recipes-containers/docker/docker-ce_git.bb
@@ -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
diff --git a/recipes-containers/docker/docker-moby_git.bb b/recipes-containers/docker/docker-moby_git.bb
index 2bd930c6..f2599cf3 100644
--- a/recipes-containers/docker/docker-moby_git.bb
+++ b/recipes-containers/docker/docker-moby_git.bb
@@ -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
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