Compare commits
10 Commits
86ce4ea7ae
...
c153c8a2c1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c153c8a2c1 | ||
|
|
88d5ec4d25 | ||
|
|
103c67b7aa | ||
|
|
dd08f18164 | ||
|
|
31075c6943 | ||
|
|
cd3f0f4bfe | ||
|
|
61858556b5 | ||
|
|
ed6bc2dabd | ||
|
|
6cac4d828c | ||
|
|
0065ba5d3f |
36
README.en.md
36
README.en.md
@ -1,36 +0,0 @@
|
||||
# docker-compose
|
||||
|
||||
#### Description
|
||||
{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
|
||||
|
||||
#### Software Architecture
|
||||
Software architecture description
|
||||
|
||||
#### Installation
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### Instructions
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### Contribution
|
||||
|
||||
1. Fork the repository
|
||||
2. Create Feat_xxx branch
|
||||
3. Commit your code
|
||||
4. Create Pull Request
|
||||
|
||||
|
||||
#### Gitee Feature
|
||||
|
||||
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
|
||||
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
|
||||
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
|
||||
4. The most valuable open source project [GVP](https://gitee.com/gvp)
|
||||
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
|
||||
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
38
README.md
38
README.md
@ -1,39 +1 @@
|
||||
# docker-compose
|
||||
|
||||
#### 介绍
|
||||
{**以下是码云平台说明,您可以替换此简介**
|
||||
码云是 OSCHINA 推出的基于 Git 的代码托管平台(同时支持 SVN)。专为开发者提供稳定、高效、安全的云端软件开发协作平台
|
||||
无论是个人、团队、或是企业,都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
|
||||
|
||||
#### 软件架构
|
||||
软件架构说明
|
||||
|
||||
|
||||
#### 安装教程
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### 使用说明
|
||||
|
||||
1. xxxx
|
||||
2. xxxx
|
||||
3. xxxx
|
||||
|
||||
#### 参与贡献
|
||||
|
||||
1. Fork 本仓库
|
||||
2. 新建 Feat_xxx 分支
|
||||
3. 提交代码
|
||||
4. 新建 Pull Request
|
||||
|
||||
|
||||
#### 码云特技
|
||||
|
||||
1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
|
||||
2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
|
||||
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
|
||||
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目,是码云综合评定出的优秀开源项目
|
||||
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
||||
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
||||
|
||||
53
allow-older-setuptools.patch
Normal file
53
allow-older-setuptools.patch
Normal file
@ -0,0 +1,53 @@
|
||||
Upstream uses environment markers to conditionally apply some dependencies.
|
||||
Environment markers were first added in setuptools 20.6.8.
|
||||
|
||||
diff -Nurp docker-compose-1.18.0.orig/setup.py docker-compose-1.18.0/setup.py
|
||||
--- docker-compose-1.18.0.orig/setup.py 2017-12-06 19:34:46.000000000 -0600
|
||||
+++ docker-compose-1.18.0/setup.py 2017-12-26 18:09:04.896020834 -0600
|
||||
@@ -42,6 +42,17 @@ install_requires = [
|
||||
'jsonschema >= 2.5.1, < 3',
|
||||
]
|
||||
|
||||
+if sys.version_info[:2] < (3, 4):
|
||||
+ install_requires.append('enum34 >= 1.0.4')
|
||||
+
|
||||
+if sys.version_info[:2] < (3, 5):
|
||||
+ install_requires.append('backports.ssl_match_hostname >= 3.5')
|
||||
+
|
||||
+if sys.version_info[:2] < (3, 3):
|
||||
+ install_requires.append('ipaddress >= 1.0.16')
|
||||
+
|
||||
+if sys.platform == 'win32':
|
||||
+ install_requires.append('colorama >= 0.3.9')
|
||||
|
||||
tests_require = [
|
||||
'pytest',
|
||||
@@ -52,27 +63,10 @@ if sys.version_info[:2] < (3, 4):
|
||||
tests_require.append('mock >= 1.0.1')
|
||||
|
||||
extras_require = {
|
||||
- ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
|
||||
- ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
|
||||
- ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
|
||||
- ':sys_platform == "win32"': ['colorama >= 0.3.9, < 0.4'],
|
||||
'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
|
||||
}
|
||||
|
||||
|
||||
-try:
|
||||
- if 'bdist_wheel' not in sys.argv:
|
||||
- for key, value in extras_require.items():
|
||||
- if key.startswith(':') and pkg_resources.evaluate_marker(key[1:]):
|
||||
- install_requires.extend(value)
|
||||
-except Exception as e:
|
||||
- print("Failed to compute platform dependencies: {}. ".format(e) +
|
||||
- "All dependencies will be installed as a result.", file=sys.stderr)
|
||||
- for key, value in extras_require.items():
|
||||
- if key.startswith(':'):
|
||||
- install_requires.extend(value)
|
||||
-
|
||||
-
|
||||
setup(
|
||||
name='docker-compose',
|
||||
version=find_version("compose", "__init__.py"),
|
||||
|
||||
BIN
docker-compose-1.22.0.tar.gz
Normal file
BIN
docker-compose-1.22.0.tar.gz
Normal file
Binary file not shown.
90
docker-compose.spec
Normal file
90
docker-compose.spec
Normal file
@ -0,0 +1,90 @@
|
||||
%global debug_package %{nil}
|
||||
|
||||
Name: docker-compose
|
||||
Version: 1.22.0
|
||||
Release: 4
|
||||
Summary: Multi-container orchestration for Docker
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/docker/compose
|
||||
Source0: https://files.pythonhosted.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
|
||||
Patch0: allow-older-setuptools.patch
|
||||
Patch1: modify-the-limit-maximum-version.patch
|
||||
|
||||
Provides: fig = %{version}-%{release}
|
||||
Obsoletes: fig <= 1.0.1-3
|
||||
|
||||
BuildRequires: python%{?python3_pkgversion}-devel
|
||||
BuildRequires: python%{?python3_pkgversion}-setuptools
|
||||
|
||||
Requires: python%{?python3_pkgversion}-cached_property >= 1.3.0
|
||||
Requires: python%{?python3_pkgversion}-docker >= 3.4.1
|
||||
Requires: python%{?python3_pkgversion}-docker-pycreds >= 0.3.0
|
||||
Requires: python%{?python3_pkgversion}-dockerpty >= 0.4.1
|
||||
Requires: python%{?python3_pkgversion}-docopt >= 0.6.2
|
||||
Requires: python%{?python3_pkgversion}-idna >= 2.5
|
||||
Requires: python%{?python3_pkgversion}-jsonschema >= 2.6.0
|
||||
Requires: python%{?python3_pkgversion}-pysocks >= 1.6.7
|
||||
Requires: python%{?python3_pkgversion}-requests >= 2.18.4
|
||||
Requires: python%{?python3_pkgversion}-setuptools
|
||||
Requires: python%{?python3_pkgversion}-six >= 1.10.0
|
||||
Requires: python%{?python3_pkgversion}-texttable >= 0.9.1
|
||||
Requires: python%{?python3_pkgversion}-websocket-client >= 0.32.0
|
||||
Requires: python%{?python3_pkgversion}-yaml >= 3.12
|
||||
Requires: python%{?python3_pkgversion}-enum34 >= 1.0.4
|
||||
Requires: python%{?python3_pkgversion}-ipaddress >= 1.0.16
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
Compose is a tool for defining and running multi-container Docker
|
||||
applications. With Compose, you use a Compose file to configure your
|
||||
application's services. Then, using a single command, you create and
|
||||
start all the services from your configuration.
|
||||
|
||||
Compose is great for development, testing, and staging environments,
|
||||
as well as CI workflows.
|
||||
|
||||
Using Compose is basically a three-step process.
|
||||
|
||||
1. Define your app's environment with a Dockerfile so it can be
|
||||
reproduced anywhere.
|
||||
2. Define the services that make up your app in docker-compose.yml so
|
||||
they can be run together in an isolated environment:
|
||||
3. Lastly, run docker-compose up and Compose will start and run your
|
||||
entire app.
|
||||
|
||||
%prep
|
||||
%autosetup -p 1
|
||||
#Remove irrelevant dependency version constraints
|
||||
sed -e 's/, < [0-9.]\+//' -i setup.py
|
||||
|
||||
%build
|
||||
%py3_build
|
||||
|
||||
%install
|
||||
%py3_install
|
||||
install -D -p -m 644 contrib/completion/bash/docker-compose %{buildroot}%{_datadir}/bash-completion/completions/docker-compose
|
||||
install -D -p -m 644 contrib/completion/zsh/_docker-compose %{buildroot}%{_datadir}/zsh/site-functions/_docker-compose
|
||||
install -D -p -m 644 contrib/completion/fish/docker-compose.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/docker-compose.fish
|
||||
|
||||
%files
|
||||
%doc CHANGELOG.md README.rst
|
||||
%license LICENSE
|
||||
%{_bindir}/%{name}
|
||||
%{python3_sitelib}/*
|
||||
%{_datadir}/bash-completion
|
||||
%{_datadir}/zsh
|
||||
%{_datadir}/fish
|
||||
|
||||
%changelog
|
||||
* Fri Sep 11 2020 tianwei <tianwei12@huawei.com> - 1.22.0-4
|
||||
- remove irrelevant dependency version constraints
|
||||
|
||||
* Tue Jun 2 2020 maqiang <maqiang42@huawei.com> - 1.22.0-3
|
||||
- modify the limit maximum version
|
||||
|
||||
* Mon Mar 2 2020 liuchao <liuchao176@huawei.com> - 1.22.0-2
|
||||
- modify the limit maximum version
|
||||
|
||||
* Wed Sep 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.22.0-1
|
||||
- Package init
|
||||
32
modify-the-limit-maximum-version.patch
Normal file
32
modify-the-limit-maximum-version.patch
Normal file
@ -0,0 +1,32 @@
|
||||
From 57c29cf8128373e4317f89beec4fe9181c485319 Mon Sep 17 00:00:00 2001
|
||||
From: liuchao <liuchao173@huawei.com>
|
||||
Date: Sat, 29 Feb 2020 09:52:02 +0800
|
||||
Subject: [PATCH] modify the limit maximum version
|
||||
|
||||
---
|
||||
setup.py | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index e0a26b0..aec9e3a 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -32,11 +32,11 @@ def find_version(*file_paths):
|
||||
install_requires = [
|
||||
'cached-property >= 1.2.0, < 2',
|
||||
'docopt >= 0.6.1, < 0.7',
|
||||
- 'PyYAML >= 3.10, < 4',
|
||||
- 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.19',
|
||||
- 'texttable >= 0.9.0, < 0.10',
|
||||
+ 'PyYAML >= 3.10, < 5.4',
|
||||
+ 'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.22',
|
||||
+ 'texttable >= 0.9.0, < 1.50',
|
||||
'websocket-client >= 0.32.0, < 1.0',
|
||||
- 'docker >= 3.4.1, < 4.0',
|
||||
+ 'docker >= 3.4.1, < 4.1',
|
||||
'dockerpty >= 0.4.1, < 0.5',
|
||||
'six >= 1.3.0, < 2',
|
||||
'jsonschema >= 2.5.1, < 3',
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user