Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dockercompose v2 #63051

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

dockercompose v2 #63051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f2e88da
dockercompose: python on whales, adjust pull command
ITJamie Nov 9, 2022
893c9b0
dockercompose: build,restart,stop,pause,unpause,start,kill functions …
ITJamie Nov 9, 2022
5b8be7b
Update dockercompose.py
ITJamie Nov 10, 2022
e23b5ea
Merge branch 'master' into docker-compose-v2
ITJamie Jan 9, 2023
158de16
Update dockercompose.py
ITJamie Jan 9, 2023
8a807ae
remove unused version str
ITJamie Jan 9, 2023
782dd3e
use detach when using up command
ITJamie Jan 9, 2023
bf65577
docs update
ITJamie Jan 9, 2023
25de936
Merge branch 'master' into docker-compose-v2
ITJamie Feb 4, 2023
93b282f
docker-compose stop with debug support
ITJamie Feb 4, 2023
a2011d1
debug outputs for most commands
ITJamie Feb 4, 2023
54c5898
hopefully final changes
ITJamie Feb 4, 2023
61a30dd
add changelog and requirements file
ITJamie Feb 4, 2023
6ebd508
pre-commit run on linux
ITJamie Feb 5, 2023
9d3dc9d
Merge branch 'master' into docker-compose-v2
ITJamie Feb 5, 2023
eb027ea
Merge branch 'master' into docker-compose-v2
ITJamie Feb 13, 2023
10b31a5
Merge branch 'master' into docker-compose-v2
ITJamie Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/62743.added
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
added docker-compose v2 support to dockercompose module with python-on-whales library
1 change: 1 addition & 0 deletions requirements/static/ci/linux.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ hglib
redis-py-cluster
python-consul
slack_bolt
python-on-whales # added to force tests per https://github.com/saltstack/salt/pull/63051#pullrequestreview-1242907681
17 changes: 16 additions & 1 deletion requirements/static/ci/py3.10/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,9 @@ cherrypy==18.6.1
# -r requirements/static/ci/common.in
# -r requirements/static/pkg/linux.in
click==8.0.1
# via geomet
# via
# geomet
# typer
clustershell==1.8.3
# via -r requirements/static/ci/common.in
contextvars==2.4
Expand Down Expand Up @@ -655,6 +657,8 @@ pycparser==2.21 ; python_version >= "3.9"
# cffi
pycryptodomex==3.10.1
# via -r requirements/crypto.txt
pydantic==1.10.4
# via python-on-whales
pygit2==1.9.1 ; python_version >= "3.10"
# via -r requirements/static/ci/linux.in
pyiface==0.0.11
Expand Down Expand Up @@ -702,6 +706,8 @@ python-etcd==0.4.5
# via -r requirements/static/ci/common.in
python-gnupg==0.4.8
# via -r requirements/static/pkg/linux.in
python-on-whales==0.57.0
# via -r requirements/static/ci/linux.in
python-telegram-bot==13.7 ; python_version > "3.5"
# via -r requirements/static/ci/linux.in
pytz==2022.1
Expand Down Expand Up @@ -748,6 +754,7 @@ requests==2.26.0
# moto
# msrest
# python-consul
# python-on-whales
# pyvmomi
# requests-oauthlib
# responses
Expand Down Expand Up @@ -821,10 +828,18 @@ toml==0.10.2
# -r requirements/static/ci/lint.in
tornado==6.1
# via python-telegram-bot
tqdm==4.64.1
# via python-on-whales
transitions==0.8.8
# via junos-eznc
twilio==7.9.2
# via -r requirements/static/ci/linux.in
typer==0.7.0
# via python-on-whales
typing-extensions==4.4.0
# via
# pydantic
# python-on-whales
tzlocal==3.0
# via apscheduler
urllib3==1.26.6
Expand Down
15 changes: 14 additions & 1 deletion requirements/static/ci/py3.10/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,9 @@ cherrypy==18.6.1
# -r requirements/static/ci/common.in
# -r requirements/static/pkg/linux.in
click==7.1.1
# via geomet
# via
# geomet
# typer
clustershell==1.8.3
# via -r requirements/static/ci/common.in
contextvars==2.4
Expand Down Expand Up @@ -673,6 +675,8 @@ pycparser==2.21 ; python_version >= "3.9"
# cffi
pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pydantic==1.10.4
# via python-on-whales
pygit2==1.9.1 ; python_version >= "3.10"
# via -r requirements/static/ci/linux.in
pyiface==0.0.11
Expand Down Expand Up @@ -754,6 +758,8 @@ python-etcd==0.4.5
# via -r requirements/static/ci/common.in
python-gnupg==0.4.8
# via -r requirements/static/pkg/linux.in
python-on-whales==0.57.0
# via -r requirements/static/ci/linux.in
python-telegram-bot==13.7 ; python_version > "3.5"
# via -r requirements/static/ci/linux.in
pytz==2022.1
Expand Down Expand Up @@ -803,6 +809,7 @@ requests==2.25.1
# moto
# msrest
# python-consul
# python-on-whales
# pyvmomi
# requests-oauthlib
# responses
Expand Down Expand Up @@ -876,14 +883,20 @@ tomli==2.0.1
# via pytest
tornado==6.1
# via python-telegram-bot
tqdm==4.64.1
# via python-on-whales
transitions==0.8.1
# via junos-eznc
twilio==7.9.2
# via -r requirements/static/ci/linux.in
typer==0.7.0
# via python-on-whales
typing-extensions==4.2.0
# via
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
# python-on-whales
tzlocal==2.1
# via apscheduler
urllib3==1.26.6
Expand Down
21 changes: 19 additions & 2 deletions requirements/static/ci/py3.6/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,9 @@ cherrypy==18.6.1
# -r requirements/static/ci/common.in
# -r requirements/static/pkg/linux.in
click==8.0.1
# via geomet
# via
# geomet
# typer
clustershell==1.8.3
# via -r requirements/static/ci/common.in
contextvars==2.4
Expand All @@ -409,7 +411,9 @@ cryptography==3.4.7
# pyopenssl
# vcert
dataclasses==0.8
# via werkzeug
# via
# pydantic
# werkzeug
distlib==0.3.2
# via virtualenv
distro==1.6.0
Expand Down Expand Up @@ -461,6 +465,7 @@ importlib-resources==5.2.2
# backports.zoneinfo
# jaraco.text
# netaddr
# tqdm
# virtualenv
ipaddress==1.0.23
# via kubernetes
Expand Down Expand Up @@ -675,6 +680,8 @@ pycparser==2.20
# via cffi
pycryptodomex==3.10.1
# via -r requirements/crypto.txt
pydantic==1.9.2
# via python-on-whales
pygit2==1.0.3 ; python_version <= "3.8"
# via -r requirements/static/ci/linux.in
pyiface==0.0.11
Expand Down Expand Up @@ -722,6 +729,8 @@ python-etcd==0.4.5
# via -r requirements/static/ci/common.in
python-gnupg==0.4.8
# via -r requirements/static/pkg/linux.in
python-on-whales==0.6.0
# via -r requirements/static/ci/linux.in
python-telegram-bot==13.7 ; python_version > "3.5"
# via -r requirements/static/ci/linux.in
pytz==2022.1
Expand Down Expand Up @@ -768,6 +777,7 @@ requests==2.26.0
# moto
# msrest
# python-consul
# python-on-whales
# pyvmomi
# requests-oauthlib
# responses
Expand Down Expand Up @@ -842,18 +852,25 @@ toml==0.10.2
# -r requirements/static/ci/lint.in
tornado==6.1
# via python-telegram-bot
tqdm==4.64.1
# via python-on-whales
transitions==0.8.8
# via junos-eznc
twilio==7.9.2
# via -r requirements/static/ci/linux.in
typed-ast==1.4.1
# via astroid
typeguard==2.13.3
# via python-on-whales
typer==0.7.0
# via python-on-whales
typing-extensions==3.10.0.0
# via
# aiohttp
# async-timeout
# immutables
# importlib-metadata
# pydantic
# yarl
tzlocal==3.0
# via apscheduler
Expand Down
21 changes: 19 additions & 2 deletions requirements/static/ci/py3.6/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,9 @@ cherrypy==18.6.1
# -r requirements/static/ci/common.in
# -r requirements/static/pkg/linux.in
click==7.1.1
# via geomet
# via
# geomet
# typer
clustershell==1.8.3
# via -r requirements/static/ci/common.in
contextvars==2.4
Expand All @@ -415,7 +417,9 @@ cryptography==3.3.2
# pyopenssl
# vcert
dataclasses==0.8
# via werkzeug
# via
# pydantic
# werkzeug
distlib==0.3.2
# via virtualenv
distro==1.5.0
Expand Down Expand Up @@ -473,6 +477,7 @@ importlib-metadata==4.6.4
importlib-resources==1.5.0
# via
# jaraco.text
# tqdm
# virtualenv
iniconfig==1.0.1
# via pytest
Expand Down Expand Up @@ -691,6 +696,8 @@ pycparser==2.17
# via cffi
pycryptodomex==3.9.8
# via -r requirements/crypto.txt
pydantic==1.9.2
# via python-on-whales
pygit2==1.0.3 ; python_version <= "3.8"
# via -r requirements/static/ci/linux.in
pyiface==0.0.11
Expand Down Expand Up @@ -774,6 +781,8 @@ python-etcd==0.4.5
# via -r requirements/static/ci/common.in
python-gnupg==0.4.8
# via -r requirements/static/pkg/linux.in
python-on-whales==0.6.0
# via -r requirements/static/ci/linux.in
python-telegram-bot==13.7 ; python_version > "3.5"
# via -r requirements/static/ci/linux.in
pytz==2022.1
Expand Down Expand Up @@ -823,6 +832,7 @@ requests==2.25.1
# moto
# msrest
# python-consul
# python-on-whales
# pyvmomi
# requests-oauthlib
# responses
Expand Down Expand Up @@ -899,15 +909,22 @@ tomli==1.2.3
# via pytest
tornado==6.1
# via python-telegram-bot
tqdm==4.64.1
# via python-on-whales
transitions==0.8.1
# via junos-eznc
twilio==7.9.2
# via -r requirements/static/ci/linux.in
typeguard==2.13.3
# via python-on-whales
typer==0.7.0
# via python-on-whales
typing-extensions==3.10.0.0
# via
# aiohttp
# async-timeout
# importlib-metadata
# pydantic
# pytest-shell-utilities
# pytest-system-statistics
# yarl
Expand Down
17 changes: 15 additions & 2 deletions requirements/static/ci/py3.7/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,9 @@ cherrypy==18.6.1
ciscoconfparse==1.5.46
# via napalm
click==8.0.1
# via geomet
# via
# geomet
# typer
clustershell==1.8.3
# via -r requirements/static/ci/common.in
colorama==0.4.4
Expand Down Expand Up @@ -696,6 +698,8 @@ pycparser==2.20
# via cffi
pycryptodomex==3.10.1
# via -r requirements/crypto.txt
pydantic==1.10.4
# via python-on-whales
pyeapi==0.8.4
# via napalm
pygit2==1.0.3 ; python_version <= "3.8"
Expand Down Expand Up @@ -747,6 +751,8 @@ python-etcd==0.4.5
# via -r requirements/static/ci/common.in
python-gnupg==0.4.8
# via -r requirements/static/pkg/linux.in
python-on-whales==0.57.0
# via -r requirements/static/ci/linux.in
python-telegram-bot==13.7 ; python_version > "3.5"
# via -r requirements/static/ci/linux.in
pytz==2022.1
Expand Down Expand Up @@ -795,6 +801,7 @@ requests==2.26.0
# msrest
# napalm
# python-consul
# python-on-whales
# pyvmomi
# requests-oauthlib
# responses
Expand Down Expand Up @@ -878,19 +885,25 @@ toml==0.10.2
# -r requirements/static/ci/lint.in
tornado==6.1
# via python-telegram-bot
tqdm==4.64.1
# via python-on-whales
transitions==0.8.8
# via junos-eznc
twilio==7.9.2
# via -r requirements/static/ci/linux.in
typed-ast==1.4.1
# via astroid
typing-extensions==3.10.0.0
typer==0.7.0
# via python-on-whales
typing-extensions==4.4.0
# via
# aiohttp
# async-timeout
# gitpython
# immutables
# importlib-metadata
# pydantic
# python-on-whales
# yarl
tzlocal==3.0
# via apscheduler
Expand Down
Loading