Skip to content

Commit cb987de

Browse files
quaresmajosericardosalveti
authored andcommitted
base: docker-compose: adapt to oe-core 328bea56 backport
OE-core go-mod change to avoid packing go mod cache changed the path where go mods are stored locally. And since mod is not installed anymore, there is no need to remove the pre-built binaries. Signed-off-by: Jose Quaresma <[email protected]> Signed-off-by: Ricardo Salveti <[email protected]>
1 parent 9e90c23 commit cb987de

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

meta-lmp-base/recipes-containers/docker-compose/docker-compose_2.21.0.bb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ go_do_compile() {
2727
export TMPDIR="${GOTMPDIR}"
2828
mkdir -p ${B}/cli-plugins/bin
2929
${GO} mod download -modcacherw
30-
cp -f ${S}/src/github.com/docker/cli/cli/config/config.go ${B}/pkg/mod/github.com/docker/cli@v24.0.5+incompatible/cli/config/config.go
31-
# remove prebuilt binaries to avoid qa issues
32-
rm -f ${B}/pkg/mod/github.com/laurazard/godog*/bin/staticcheck*
33-
rm -f ${B}/pkg/mod/github.com/in-toto/in-toto-golang*/test/data/helloworld
30+
cp -f ${S}/src/github.com/docker/cli/cli/config/config.go ${B}/.mod/github.com/docker/cli@v24.0.5+incompatible/cli/config/config.go
3431
${GO} build ${GOBUILDFLAGS} -o ${B}/cli-plugins/bin/docker-compose ./cmd
3532
}
3633

0 commit comments

Comments
 (0)