From 4ad3d065817384978a4e31ef3627a927b228cf46 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Fri, 6 May 2022 18:20:45 -0300 Subject: [PATCH 1/2] base: docker-compose: update to 2.5.0 What's changed: * Fix search/replace typo in --no-TTY documentation * Fix panic with down command when -p flag specified * Use project we just created to start services * Include services declared by links as implicit dependencies * Pull to respect pull_policy * Don't ignore error * Project name MUST be lowercase * Add support for build secrets * Create also a checksums.txt file, add --binary * Add support for ppc64le for docker compose * Inspect image ID after pull to se com.docker.compose.image * Fix cannot setup IPAM gateway Signed-off-by: Ricardo Salveti --- .../{docker-compose_2.4.1.bb => docker-compose_2.5.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-lmp-base/recipes-containers/docker-compose/{docker-compose_2.4.1.bb => docker-compose_2.5.0.bb} (96%) diff --git a/meta-lmp-base/recipes-containers/docker-compose/docker-compose_2.4.1.bb b/meta-lmp-base/recipes-containers/docker-compose/docker-compose_2.5.0.bb similarity index 96% rename from meta-lmp-base/recipes-containers/docker-compose/docker-compose_2.4.1.bb rename to meta-lmp-base/recipes-containers/docker-compose/docker-compose_2.5.0.bb index f986e530c5..abf600f65d 100644 --- a/meta-lmp-base/recipes-containers/docker-compose/docker-compose_2.4.1.bb +++ b/meta-lmp-base/recipes-containers/docker-compose/docker-compose_2.5.0.bb @@ -12,7 +12,7 @@ SRC_URI = "\ file://cli-config-support-default-system-config.patch \ " -SRCREV_compose = "8d815ff587d7d5da90835a5007859edb9fafff61" +SRCREV_compose = "41b3967cb521a7c7254155a70fbafa5f5ae02aad" SRCREV_cli = "2b52f62e962783ef39b53d1cb95e1d435b33f3cd" UPSTREAM_CHECK_COMMITS = "1" From da66f3132f74b3246a9e65f9634b62fcecfc66c9 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Fri, 6 May 2022 18:42:35 -0300 Subject: [PATCH 2/2] base: lmp-feature-docker: switch to the golang based compose Now that aktualizr-lite is compatible with the new golang-based docker-compose, make it the default in lmp. Signed-off-by: Ricardo Salveti --- meta-lmp-base/recipes-samples/images/lmp-feature-docker.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-lmp-base/recipes-samples/images/lmp-feature-docker.inc b/meta-lmp-base/recipes-samples/images/lmp-feature-docker.inc index d3a125aac7..16862fa310 100644 --- a/meta-lmp-base/recipes-samples/images/lmp-feature-docker.inc +++ b/meta-lmp-base/recipes-samples/images/lmp-feature-docker.inc @@ -2,8 +2,7 @@ CORE_IMAGE_BASE_INSTALL += " \ docker \ docker-credential-helper-fio \ - python3-docker \ - python3-docker-compose \ + docker-compose \ " EXTRA_USERS_PARAMS += "\