From 86d9188a96d166b46f67f2ab651139e159f64dad Mon Sep 17 00:00:00 2001 From: Sergey Zhemoitel Date: Wed, 15 Dec 2021 23:08:55 +0300 Subject: [PATCH] New version 2.2.2 --- .abf.yml | 1 + docker-compose.spec | 109 +++++++++++++------------------------------- 2 files changed, 33 insertions(+), 77 deletions(-) diff --git a/.abf.yml b/.abf.yml index 39e8214..a516f52 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,3 @@ sources: compose-1.29.1.tar.gz: 14f4c5134fabd56c44ac0ca91bc39ace902a7fc9 + docker-compose-%{verson}.tar.gz: 191fdd50b8a89f97fd9958f08068b3d3e00246b6 diff --git a/docker-compose.spec b/docker-compose.spec index 572c0e2..4e7c356 100644 --- a/docker-compose.spec +++ b/docker-compose.spec @@ -1,90 +1,45 @@ -%global dcvers 1.29.1 -#global dcrc rc1 -%global dist_version %{dcvers} +%define debug %nil +%define debug_package %nil -%global debug_package %{nil} -%global provider github -%global provider_tld com -%global project docker -%global repo compose -%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} +%define oname docker-compose -Name: %{project}-%{repo} -Version: %{dist_version} -Release: 1 -Summary: Multi-container orchestration for Docker -Group: System/Kernel and hardware -License: ASL 2.0 -URL: https://www.docker.com/ -#Source0: https://%{import_path}/archive/%{dcvers}-%{dcrc}.tar.gz -#Source0: %{repo}-%{dist_version}.tar.gz -Source0: https://github.com/docker/compose/archive/%{version}/%{repo}-%{version}.tar.gz - -# docker-compose is compatible with fig and is a simple rename. -Provides: fig = %{version}-%{release} -Obsoletes: fig < 1.0.0-4 - -BuildRequires: pkgconfig(python3) -BuildRequires: python3egg(setuptools) -BuildRequires: python3egg(docker) >= 4.4 -BuildRequires: python3egg(websocket-client) -BuildRequires: python3egg(texttable) -BuildRequires: python3egg(requests) -BuildRequires: python3egg(pyyaml) -BuildRequires: python3egg(docopt) -BuildRequires: python3egg(cached-property) -BuildRequires: python3egg(six) >= 1.12.0 - -Requires: python3egg(repoze.lru) -Requires: python3egg(texttable) -Requires: python3egg(ipaddress) >= 1.0.16 -Requires: python3egg(cached-property) -Requires: python3egg(paramiko) -Requires: python3egg(six) >= 1.12.0 -Requires: python3egg(subprocess32) -Requires: python3egg(docopt) < 1 -Requires: python3egg(websocket-client) -Requires: python3egg(docker) >= 4.4 -Requires: python3egg(backports.shutil-get-terminal-size) == 1.0.0 -Requires: python3-pkg-resources -Requires: python3egg(functools32) -Requires: python3egg(python-dotenv) >= 0.13.0 -Requires: python3egg(distro) >= 1.5.0 -Requires: pigz - -BuildArch: noarch +Name: %{oname} +Version: 2.2.2 +Release: 1 +Summary: Docker compose golang version +URL: https://docs.docker.com/compose +Source0: https://github.com/docker/compose/archive/v%{version}/%{name}-%{verson}.tar.gz +Group: Development/Other +License: ASL 2.0 +BuildRequires: go +BuildRequires: git-core +BuildRequires: upx +Requires: docker %description -Multi-container orchestration for Docker +Docker Compose v2 -Docker-compose allows you to: -- Define your application's environment with Docker so it can be reproduced - anywhere. -- Define the services that make up your app so they can be run together in an - isolated environment. -- Run 'docker-compose up', and docker-compose will start and run your entire - app. +Docker Compose is a tool for running multi-container +applications on Docker defined using the Compose file +format. A Compose file is used to define how the one or +more containers that make up your application are +configured. Once you have a Compose file, you can +create and start your application with a single command: + +docker compose up %prep -#setup -q -n %{repo}-%{dcvers}-%{dcrc} -%setup -q -n %{repo}-%{version} -perl -pi -e "s|'PyYAML >= 3.10, < 4',|'PyYAML >= 4.1',|" setup.py -perl -pi -e "s|'PyYAML==3.12'||" requirements.txt -perl -pi -e "s|'texttable >= 0.9.0, < 0.10',|'texttable >= 1.2',|" setup.py -perl -pi -e "s|'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',|'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0',|" setup.py +%setup -qn compose-%{version} %build -%{py3_build} +CGO_ENABLED=0 go build -trimpath -ldflags="-s -w -X github.com/docker/compose/v2/internal.Version=%{version}" -o bin/%{oname} ./cmd +upx bin/%{oname} + +find . -type f -size 0 -exec rm -f {} \; %install -%{py3_install} +install -Dm0755 bin/%{oname} %{buildroot}%{_bindir}/%{oname} %files -%doc CHANGES.md CONTRIBUTING.md README.md SWARM.md -%doc LICENSE -%{_bindir}/%{name} -# Upstream uses an underscore here -%{py3_puresitedir}/docker_compose* -%{py3_puresitedir}/compose* - - +%doc README.md LICENSE docs +%{_bindir}/%{oname}