commit fdd6434956235c23f645cd0c3dcc238352d2ea20 Author: Matt Housh <jaeger@crux.ninja> Date: Thu Dec 2 17:17:53 2021 -0600 docker-compose: updated to version 2.2.1; NOTE: this is v2 and now depends on go rather than python diff --git a/docker-compose/.footprint b/docker-compose/.footprint index 279d6ec16..2f433b61e 100644 --- a/docker-compose/.footprint +++ b/docker-compose/.footprint @@ -1,99 +1,3 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/docker-compose -drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/python3.9/ -drwxr-xr-x root/root usr/lib/python3.9/site-packages/ -drwxr-xr-x root/root usr/lib/python3.9/site-packages/compose/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__init__.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__main__.py -drwxr-xr-x root/root usr/lib/python3.9/site-packages/compose/__pycache__/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/__init__.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/__main__.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/const.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/container.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/errors.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/network.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/parallel.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/progress_stream.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/project.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/service.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/timeparse.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/utils.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/version.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/__pycache__/volume.cpython-39.pyc -drwxr-xr-x root/root usr/lib/python3.9/site-packages/compose/cli/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__init__.py (EMPTY) -drwxr-xr-x root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/__init__.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/colors.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/command.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/docker_client.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/docopt_command.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/errors.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/formatter.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/log_printer.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/main.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/signals.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/utils.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/__pycache__/verbose_proxy.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/colors.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/command.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/docker_client.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/docopt_command.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/errors.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/formatter.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/log_printer.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/main.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/signals.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/utils.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/cli/verbose_proxy.py -drwxr-xr-x root/root usr/lib/python3.9/site-packages/compose/config/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/__init__.py -drwxr-xr-x root/root usr/lib/python3.9/site-packages/compose/config/__pycache__/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/__pycache__/__init__.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/__pycache__/config.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/__pycache__/environment.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/__pycache__/errors.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/__pycache__/interpolation.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/__pycache__/serialize.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/__pycache__/sort_services.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/__pycache__/types.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/__pycache__/validation.cpython-39.pyc --rw-rw-r-- root/root usr/lib/python3.9/site-packages/compose/config/compose_spec.json --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/config.py --rw-rw-r-- root/root usr/lib/python3.9/site-packages/compose/config/config_schema_v1.json --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/environment.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/errors.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/interpolation.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/serialize.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/sort_services.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/types.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/config/validation.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/const.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/container.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/errors.py -drwxr-xr-x root/root usr/lib/python3.9/site-packages/compose/metrics/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/metrics/__init__.py (EMPTY) -drwxr-xr-x root/root usr/lib/python3.9/site-packages/compose/metrics/__pycache__/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/metrics/__pycache__/__init__.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/metrics/__pycache__/client.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/metrics/__pycache__/decorator.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/metrics/client.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/metrics/decorator.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/network.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/parallel.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/progress_stream.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/project.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/service.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/timeparse.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/utils.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/version.py --rw-r--r-- root/root usr/lib/python3.9/site-packages/compose/volume.py -drwxr-xr-x root/root usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/entry_points.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/docker_compose-1.29.2-py3.9.egg-info/top_level.txt diff --git a/docker-compose/.signature b/docker-compose/.signature index 174f9629a..9423e266d 100644 --- a/docker-compose/.signature +++ b/docker-compose/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/tWLJBZf13Ncm22cVrnwDFnErBNjyg2ry9aEsobOHiB9mbwnMni5s4ZjvqJbA2e5WXUJv6p61UWcUPpQd2BfAc= -SHA256 (Pkgfile) = 47cf3e48181fb24d7debaf5d8335c853e7bf6e56adca5c4f4eb55601fbebaf56 -SHA256 (.footprint) = 5c2124fca93b43748ded86fe097336505f142635b8e78acd24b7320f58560582 -SHA256 (docker-compose-1.29.2.tar.gz) = 99a9b91d476062d280c889ae4e9993d7dd6a186327bafb2bb39521f9351b96eb +RWSagIOpLGJF3yXgnnE73sq7MUjvXSIO8B3+lqIRVAE8Fq/7IQjfD4dDSjls2zcOMgpKBv2lJvb4YMODskld6LUWMwRNPHz/6Qw= +SHA256 (Pkgfile) = 39b5b6fed4e33b2a246b9048e6da910f1c63f5696914736ed2e421f72e873b98 +SHA256 (.footprint) = 7154d1f66d9f29102103d3d93b9968c5c01ab4baa58ef7acec084fab6b6c2cb9 +SHA256 (docker-compose-2.2.1.tar.gz) = 439dd5b7244b63d162e7a06e9ad84d63f9d7f357fae00582247ed0a41da7e35e diff --git a/docker-compose/Pkgfile b/docker-compose/Pkgfile index c03bb5011..432dcf82c 100644 --- a/docker-compose/Pkgfile +++ b/docker-compose/Pkgfile @@ -1,15 +1,18 @@ # Description: Compose is a tool for defining and running multi-container Docker applications # URL: https://docs.docker.com/compose/ # Maintainer: Matt Housh, jaeger at crux dot ninja -# Depends on: python3-jsonschema python3-six python3-dockerpty python3-docker python3-websocket-client python3-texttable python3-requests python3-yaml python3-docopt python3-cached-property python3-importlib_metadata python3-pyrsistent python3-attrs python3-paramiko python3-zipp python3-pynacl python3-bcrypt python3-distro python3-dotenv +# Depends on: go name=docker-compose -version=1.29.2 +version=2.2.1 release=1 -source=(https://github.com/docker/compose/archive/$version/$name-$version.tar.gz) +source=(https://github.com/docker/compose/archive/v$version/$name-$version.tar.gz) build() { + export CGO_CFLAGS="${CFLAGS}" + export CGO_CPPFLAGS="${CXXFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" cd compose-$version - python3 setup.py build - python3 setup.py install --root=$PKG + go build -trimpath -o ${name} ./cmd + install -Dm0755 ${name} ${PKG}/usr/bin/${name} }