Page MenuHomeSolus

D13047.id31886.diff
No OneTemporary

D13047.id31886.diff

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,5 @@
+This file is used to indicate responsibility for the maintenance of this package. Individuals on this list should be the sole modifiers of the package, excluding cases where the Solus Team may need to perform necessary rebuilds, upgrades, or security fixes. This list should not be used for any direct contact usage. If you believe this package requires a package update, follow documentation from https://getsol.us/articles/packaging/request-a-package-update/en/. In the event this package no longer becomes sufficiently maintained, Core Team reserves the right to request a new maintainer or remove this package from the repository.
+
+- Reilly Brogan
+ - IRC: reillybrogan
+ - Email: solus@reillybrogan.com
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,40 +1,34 @@
name : docker-compose
-version : 1.29.2
-release : 24
+version : 2.3.3
+release : 25
source :
- - https://github.com/docker/compose/archive/1.29.2.tar.gz : 99a9b91d476062d280c889ae4e9993d7dd6a186327bafb2bb39521f9351b96eb
+ - https://github.com/docker/compose/archive/refs/tags/v2.3.3.tar.gz : bcca033859abfbb0949c4455725e5b01593f217f0b32b1d7f861c75c0b69f285
license : Apache-2.0
component : virt
summary : A tool for defining and running multi-container Docker applications.
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.
+networking : yes
builddeps :
- - pkgconfig(python3)
- - python-cached-property
- - python-docker-py
- - python-dockerpty
- - python-docopt
- - python-jsonschema
- - python-paramiko
- - python-pytest
- - python-texttable
+ - golang
rundeps :
- docker
- - python-cached-property
- - python-colorama
- - python-distro
- - python-docker-py
- - python-dockerpty
- - python-docopt
- - python-dotenv
- - python-paramiko
- - python-jsonschema
- - python-texttable
- - pyyaml
+environment: |
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+
+ export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -ldflags=-X=github.com/docker/compose/v2/internal.Version=v$version -mod=readonly -modcacherw"
+
+ export _cli_plugins_dir=/usr/lib/docker/cli-plugins
build : |
- %python3_setup
+ CGO_ENABLED=0 go build -trimpath -tags "e2e,kube" -o compose ./cmd
install : |
- %python3_install
- install -Dm00644 contrib/completion/bash/docker-compose $installdir/usr/share/bash-completion/completions/docker-compose
- install -Dm00644 contrib/completion/zsh/_docker-compose $installdir/usr/share/zsh/site-functions/_docker-compose
+ install -Ddm00755 $installdir/$_cli_plugins_dir
+ install -m00755 compose $installdir/$_cli_plugins_dir/docker-compose
+
+ # Compatibility symlink
+ install -Ddm00755 "$installdir/usr/bin"
+ ln -sf /usr/lib/docker/cli-plugins/docker-compose "$installdir/usr/bin/docker-compose"
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>docker-compose</Name>
<Packager>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Reilly Brogan</Name>
+ <Email>solus@reillybrogan.com</Email>
</Packager>
<License>Apache-2.0</License>
<PartOf>virt</PartOf>
@@ -22,101 +22,16 @@
<PartOf>virt</PartOf>
<Files>
<Path fileType="executable">/usr/bin/docker-compose</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__init__.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__main__.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/__init__.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/__main__.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/const.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/container.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/errors.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/network.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/parallel.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/progress_stream.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/project.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/service.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/timeparse.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/utils.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/version.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/__pycache__/volume.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__init__.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__pycache__/__init__.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__pycache__/colors.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__pycache__/command.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__pycache__/docker_client.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__pycache__/docopt_command.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__pycache__/errors.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__pycache__/formatter.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__pycache__/log_printer.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__pycache__/main.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__pycache__/signals.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__pycache__/utils.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/__pycache__/verbose_proxy.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/colors.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/command.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/docker_client.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/docopt_command.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/errors.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/formatter.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/log_printer.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/main.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/signals.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/utils.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/cli/verbose_proxy.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/__init__.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/__pycache__/__init__.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/__pycache__/config.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/__pycache__/environment.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/__pycache__/errors.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/__pycache__/interpolation.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/__pycache__/serialize.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/__pycache__/sort_services.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/__pycache__/types.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/__pycache__/validation.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/compose_spec.json</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/config.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/config_schema_v1.json</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/environment.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/errors.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/interpolation.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/serialize.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/sort_services.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/types.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/config/validation.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/const.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/container.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/errors.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/metrics/__init__.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/metrics/__pycache__/__init__.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/metrics/__pycache__/client.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/metrics/__pycache__/decorator.cpython-39.pyc</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/metrics/client.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/metrics/decorator.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/network.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/parallel.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/progress_stream.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/project.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/service.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/timeparse.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/utils.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/version.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/compose/volume.py</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/PKG-INFO</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/SOURCES.txt</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/dependency_links.txt</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/entry_points.txt</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/requires.txt</Path>
- <Path fileType="library">/usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/top_level.txt</Path>
- <Path fileType="data">/usr/share/bash-completion/completions/docker-compose</Path>
- <Path fileType="data">/usr/share/zsh/site-functions/_docker-compose</Path>
+ <Path fileType="library">/usr/lib/docker/cli-plugins/docker-compose</Path>
</Files>
</Package>
<History>
- <Update release="24">
- <Date>2021-07-28</Date>
- <Version>1.29.2</Version>
+ <Update release="25">
+ <Date>2022-03-19</Date>
+ <Version>2.3.3</Version>
<Comment>Packaging update</Comment>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Reilly Brogan</Name>
+ <Email>solus@reillybrogan.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 6:46 PM (2 h, 27 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5819651
Default Alt Text
D13047.id31886.diff (14 KB)

Event Timeline