diff --git a/README.en.md b/README.en.md deleted file mode 100644 index a7575763d9e17ff2497caa5e57a5ccfb2d95ccdc..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -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/) diff --git a/README.md b/README.md index 2a16ae4485b4293abcc0cc51af26368362bcb13c..48ed70b2e102522cb8c79c2ec48283128a30accd 100644 --- a/README.md +++ b/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/) diff --git a/allow-older-setuptools.patch b/allow-older-setuptools.patch new file mode 100644 index 0000000000000000000000000000000000000000..2694d4858b474a6359b9ddc3fc94353b11b8adc4 --- /dev/null +++ b/allow-older-setuptools.patch @@ -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"), + diff --git a/docker-compose-1.22.0.tar.gz b/docker-compose-1.22.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..5c65aaa3cefb2c8795e3fbefcaf20d95c37322de Binary files /dev/null and b/docker-compose-1.22.0.tar.gz differ diff --git a/docker-compose.spec b/docker-compose.spec new file mode 100644 index 0000000000000000000000000000000000000000..828197b52f0da38b3d79a4deca860d9213aeb804 --- /dev/null +++ b/docker-compose.spec @@ -0,0 +1,78 @@ +%global debug_package %{nil} + +Name: docker-compose +Version: 1.22.0 +Release: 1 +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 + +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 + +%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 +* Wed Sep 11 2019 openEuler Buildteam - 1.22.0-1 +- Package init