From 9db6b4ababa9c9ee751d627ac00386fe9bfe7b7a Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Fri, 29 Mar 2024 17:32:00 +0100 Subject: [PATCH 1/2] docker-compose: Update to version 2.26.1 Release notes: https://github.com/docker/compose/releases/tag/v2.26.1 Signed-off-by: Javier Marcet --- utils/docker-compose/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile index 1c9ce4f416..81c74fa1ec 100644 --- a/utils/docker-compose/Makefile +++ b/utils/docker-compose/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compose -PKG_VERSION:=2.26.0 +PKG_VERSION:=2.26.1 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}? -PKG_HASH:=b42bb6b118b664db8a37a160b4b3782712199fedd35731a2314b5762b2700d3f +PKG_HASH:=081ad40241f8e144cad088a65e6fd0ec588e3d36931e5baabb3dc5ab068ceb60 PKG_MAINTAINER:=Javier Marcet From 261b38c14bed7865d244f24d0adb1bb33e963b88 Mon Sep 17 00:00:00 2001 From: Javier Marcet Date: Sat, 30 Mar 2024 16:59:10 +0100 Subject: [PATCH 2/2] docker-compose: add PKG_NAME to PKG_SOURCE Before this change, the tarball was downloaded as vVERSION.tar.gz. For example, it was v2.26.1.tar.gz and that file was put into the dl folder within the OpenWrt build system. After this change, the tarball is properly downloaded as NAME-vVERSION.tar.gz. In this case, it will look like this: docker-compose-v.2.26.1.tar.gz The advantages of using this: - Users, developers will know that what they downloaded (it has name and version) - The tarball will not be overwritten by another package with the same version. Signed-off-by: Javier Marcet Signed-off-by: Josef Schlehofer [added commit message] --- utils/docker-compose/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/docker-compose/Makefile b/utils/docker-compose/Makefile index 81c74fa1ec..621a6134a2 100644 --- a/utils/docker-compose/Makefile +++ b/utils/docker-compose/Makefile @@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=compose PKG_VERSION:=2.26.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_SOURCE:=v$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/docker/compose/tar.gz/v${PKG_VERSION}? PKG_HASH:=081ad40241f8e144cad088a65e6fd0ec588e3d36931e5baabb3dc5ab068ceb60