extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-02-16 02:10:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
806 Commits 3 Branches 10 Tags 17 MiB
fb0bbd6fe1
Commit Graph

442 Commits

Author SHA1 Message Date
Artho Pacini
3b15170ccf Changed the global parser help message for file input, to reflect changes for reading from stdin 
Signed-off-by: Artho Pacini <eu@arthopacini.com>
 2024-06-18 00:05:31 +03:00
Artho Pacini
3359380ec6 Add ability to input docker-compose.yaml via stdin 
Signed-off-by: Artho Pacini <eu@arthopacini.com>
 2024-06-18 00:05:31 +03:00
Monika Kairaityte
e799a0b0ea Fix x-podman.gidmap typo 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-06-14 17:31:55 +03:00
Hedayat Vatankhah
f3e9a96c96 Fixes #908: Add support for multi-line environment files 
Signed-off-by: Hedayat Vatankhah <hedayat.fwd@gmail.com>
 2024-05-28 23:43:15 +03:00
Otto Liljalaakso
cac836b0f5 Support additional_contexts 
Signed-off-by: Otto Liljalaakso <otto.liljalaakso@novatron.fi>
 2024-05-21 19:44:37 +03:00
Muayyad Alsadi
5d4de80ab7
Merge pull request #911 from charliemirabile/selinux 
Add support for selinux in verbose bind mount specification
 2024-05-19 11:13:45 +03:00
Muayyad Alsadi
23ad5c3ef7
Merge pull request #920 from mokeyish/gpu 
Add supoort for enabling GPU access
 2024-05-19 11:12:34 +03:00
Zhen Liu
1d64f2cf8c Update podman_compose.py 
fix #940

Signed-off-by: Zhen Liu <lzhen.dev@outlook.com>
 2024-05-18 20:33:10 +08:00
Hedayat Vatankhah
4e22faefd6 Fix logging build error message 
Signed-off-by: Hedayat Vatankhah <hedayat.fwd@gmail.com>
 2024-05-13 15:13:40 +03:00
Muayyad Alsadi
7a2da76ab8
Merge pull request #724 from hedayat/fix-merge-depends-on 
Fixes #723: merge short & long syntax of depends_on dependencies
 2024-05-08 17:57:44 +03:00
YISH
79865c2e13 Add support for enabling GPU access 
Signed-off-by: YISH <mokeyish@hotmail.com>
 2024-05-07 10:32:24 +08:00
fccagou
c23a8b2cbd Do not pass --ipam-driver option when value set to default 
fixes #852.

Signed-off-by: fccagou <me@fccagou.fr>
 2024-05-06 17:00:17 +03:00
Alexandre Germain
b202a09501 Add support for env_file as objects 
Fixes: https://github.com/containers/podman-compose/issues/897

Signed-off-by: Alexandre Germain <nihilivin@gmail.com>
 2024-05-06 14:13:37 +03:00
Johannes
5c4aa40032 add await for create_pods call 
fixes log output podman_compose.py:2527: RuntimeWarning: coroutine 'create_pods' was never awaited

Signed-off-by: Johannes Kasberger <schugabe@gmx.at>
 2024-05-06 11:02:45 +02:00
Winston
d31a8b124d
Don't create pods/container when registering systemd unit 
Signed-off-by: Winston <44872771+winston-yallow@users.noreply.github.com>
 2024-05-01 20:03:14 +02:00
Povilas Kanapickas
70a0e2d003 Fix handling of --in-pod argument 
Currently --in-pod handling is broken because the only way to set False
is by providing empty argument like "--in-pod=". As of Python 3.7 the
solution is to accept string and parse manually.

Co-authored-by: Randolph Sapp <res.sapp@gmail.com>
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-04-28 21:16:34 +03:00
Mohammed Tayeh
eea8bac496 Add images command 
Signed-off-by: Mohammed Tayeh <m.tayeh94@gmail.com>
 2024-04-28 19:04:23 +03:00
Povilas Kanapickas
9599cc039e Migrate x-podman dictionary to x-podman.* fields in container root 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-04-28 18:24:37 +03:00
GnSight
77f2e8e5b0 Support podman's external rootfs management 
Signed-off-by: GnSight <ftyg@live.com>
 2024-04-28 17:55:39 +03:00
Denis Ledoux
72a94d5185 implement --publish in docker-compose run 
Signed-off-by: Denis Ledoux <dle@odoo.com>
 2024-04-28 00:54:35 +02:00
Povilas Kanapickas
2681566580 Release 1.1.0 2024-04-19 12:37:30 +03:00
Povilas Kanapickas
131010bc9d Use x- prefix for x-podman.mac_address 
Docker compose documents x- prefix as standard vendor prefix.

https://github.com/compose-spec/compose-spec/pull/18

Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-04-17 20:16:03 +03:00
Cam Spiers
cdcedeb6b2 Use "service.build.ulimits" when present instead of "service.ulimits" 
Signed-off-by: Cam Spiers <camspiers@gmail.com>
 2024-04-17 19:45:34 +03:00
charliemirabile
d7cf0966d3 add support for selinux in verbose mount 
This corresponds to specifying the `z` or `Z` option in the third
portion of a terse mount specification (i.e. src:trg:z)

Signed-off-by: charliemirabile <46761267+charliemirabile@users.noreply.github.com>
 2024-04-10 15:29:03 -04:00
Povilas Kanapickas
e893d06313
Merge pull request #867 from baszoetekouw/fix-networks 
Fix multiple networks with separately specified ip and mac
 2024-04-08 23:21:38 +03:00
Hedayat Vatankhah
1f35c00694
Add unit test for depends_on normalization as a dict 
Signed-off-by: Hedayat Vatankhah <hedayat.fwd@gmail.com>
 2024-04-08 23:31:41 +03:30
AndrweCottrell
6c09ce710e FIX issue https://github.com/containers/podman-compose/issues/704 - Windows fix sock not working. 2024-04-07 16:28:45 +10:00
Bas Zoetekouw
953534a71a Support and document all podman-specific network_modes 
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
 2024-03-28 16:09:43 +02:00
Bas Zoetekouw
6feff244db slirp4netns can be used without options 
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
 2024-03-28 16:09:43 +02:00
Bas Zoetekouw
65849c95e2 add comment about per-network aliases 
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
 2024-03-28 16:09:43 +02:00
Bas Zoetekouw
9baea704d7 use preferred format of podman command line options 
Specifically:
  - use "--network=foo" instead of "--network foo"
  - specify "--network-alias" multiple times instead of concatenating values

Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
 2024-03-28 16:09:43 +02:00
Bas Zoetekouw
bdff78dcba Ignore files generated by tests 
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
 2024-03-28 16:09:43 +02:00
Bas Zoetekouw
45ca1f994f Support podman-specific per-network mac_address specifiation 
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
 2024-03-28 16:09:43 +02:00
Bas Zoetekouw
2743d690d2 Fix support for multiple networks with explicitly specified ipv4/ipv6 addresses 
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
 2024-03-28 16:09:43 +02:00
wiehe
1e9cf1dff0
Pass file secrets to "podman build" via parameter "--secret" 
to make them available for "RUN --mount=type=secret" statements inside the
Dockerfile.

Keep using --volume to pass file secrets to "podman run".

Signed-off-by: wiehe <28457227+wiehe@users.noreply.github.com>
 2024-03-12 17:23:40 +01:00
Povilas Kanapickas
f18c8092cc
Merge pull request #887 from baszoetekouw/fix-oldpython 
Fix support for older python versions
 2024-03-09 23:29:32 +02:00
Povilas Kanapickas
43059dc16f
Merge pull request #783 from ChuJiani/devel 
Fix #782: add support for `http-proxy` option of podman
 2024-03-09 23:27:22 +02:00
Bas Zoetekouw
fde7995cb8
Fix python < 3.11 compatibility 
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
 2024-03-09 22:26:36 +01:00
Bas Zoetekouw
688ee9a104
Fix pylint issues 
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
 2024-03-09 22:26:35 +01:00
Ari Pollak
f2f5483a74 Extract compose_run args parsing and add unit tests 
Signed-off-by: Ari Pollak <ajp@aripollak.com>
 2024-03-09 16:18:13 -05:00
Ari Pollak
c4fa8f7a16 Split exec args parsing into new function and add unit tests for it 
Signed-off-by: Ari Pollak <ajp@aripollak.com>
 2024-03-09 16:02:47 -05:00
Ari Pollak
4c270b9116 Allow run/exec -e with equals sign in value 
Fixes: #798
Signed-off-by: Ari Pollak <ajp@aripollak.com>
 2024-03-09 14:35:08 -05:00
ChuJiani
c98cbaaaf0 Fix #782: add support for http_proxy 
Signed-off-by: ChuJiani <archet@chujiani.top>
 2024-03-09 17:10:09 +00:00
Evgeniy Timokhov
91d316ff1f Added handling pid option 
Fixes #554

Signed-off-by: Evgeniy Timokhov <timocov@gmail.com>
 2024-03-09 16:10:37 +00:00
Maximilian R
969edb88d0 Add support for enable_ipv6 
Signed-off-by: Maximilian R <maxi.rostock@outlook.de>
 2024-03-09 13:01:41 +02:00
Maximilian R
bba1f33d51 Factor out arg creation for "network create". Add unit tests. 
Signed-off-by: Maximilian R <public@complexvector.space>
 2024-03-09 13:00:09 +02:00
lemmi
a9c335bf82 Handle sysctls maps 
- Add support to handle sysctls maps.
- Directly raise an error if sysctls is neither an array nor map instead
  of letting podman fail with an unhelpful message.

Support for sysctls arrays was added in #261.

Fixes #754: sysctls only works with arrays, not maps

Signed-off-by: lemmi <lemmi@nerd2nerd.org>
 2024-03-09 12:44:55 +02:00
Tanel Liiv
2cdfb3e6d4 Fix stop/restart args stacking 
Signed-off-by: Tanel Liiv <tanel.liiv@reconeyez.com>
Signed-off-by: Tanel Liiv <liivtanel@gmail.com>
 2024-03-09 12:39:53 +02:00
Florian Maurer
da520e299b
switch to % string lazy formatting 
* fix black and pylint issues

Signed-off-by: Florian Maurer <f.maurer@outlook.de>
 2024-03-09 10:40:24 +01:00
James O'Beirne
1e9e2ee776
Output: use logging, remove garbage output by default 
Fixes #489.

Introduces a --verbose flag if you want to see all the noise that
was previously printed by default.

Signed-off-by: James O'Beirne <james.obeirne@pm.me>
Signed-off-by: Florian Maurer <f.maurer@outlook.de>
 2024-03-09 10:36:20 +01:00
Brett Calliss
0f693ee584 Replaces asyncio timeout with bespoke timeout function 
Signed-off-by: Brett Calliss <brett@obligatory.email>
 2024-03-09 19:02:32 +11:00
Povilas Kanapickas
a8db898ac6
Merge pull request #883 from p12tic/lint-fixes 
Enable ruff check and fix lint errors
 2024-03-08 23:51:25 +02:00
Povilas Kanapickas
15ae2140d4 Add support for runtime service configuration key 
https://docs.docker.com/compose/compose-file/05-services/#runtime

Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 23:48:55 +02:00
Povilas Kanapickas
4e43606df3 Shorten too long lines 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 23:46:24 +02:00
Povilas Kanapickas
91052cb2d9 Fix ambiguous variable name 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 23:46:23 +02:00
Povilas Kanapickas
a6e0092627 Remove unused variable 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 23:46:22 +02:00
Povilas Kanapickas
59a1fa3942 Use 'not in' for membership test 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 23:46:21 +02:00
Povilas Kanapickas
36139fb282 Remove unused f-string 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 23:46:20 +02:00
Povilas Kanapickas
b0da6f82d3 Fix import formatting 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 23:46:19 +02:00
Povilas Kanapickas
b34f699adb Add SPDX license identifiers to each source file 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 12:19:51 +02:00
Povilas Kanapickas
a967cab02b Format codebase with ruff 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-07 18:28:06 +02:00
Muayyad Alsadi
831caa6276 remove recursion 2024-02-06 00:23:14 +03:00
Ben Plessinger
9ac33392a0 Fix issue #831 
Signed-off-by: Ben Plessinger <Benjamin.Plessinger@roswellpark.org>
 2024-02-06 00:20:11 +03:00
Falmarri
c6a1c4c432 Add tests to make sure all async paths are covered 
Not at 100% yet. But upped code coverage significantly and covered major
async calls.

Signed-off-by: Falmarri <463948+Falmarri@users.noreply.github.com>
 2024-02-04 10:11:57 +03:00
Falmarri
3c9628b462 Fix a couple issues and update docs 
Signed-off-by: Falmarri <463948+Falmarri@users.noreply.github.com>
 2024-02-04 10:11:57 +03:00
Falmarri
38b13a34ea Use asyncio for subprocess calls 
Removes the threads from compose_up and manages it using async. Also
uses async processing to format the log messages instead of piping
through sed. This should work on windows without having sed installed

Adds --parallel to support pull and build in parallel, same as docker
compose

Signed-off-by: Falmarri <463948+Falmarri@users.noreply.github.com>
 2024-02-04 10:11:57 +03:00
ambiamber
bce40c2db3 Change "an key-value" to "a key-value" 2023-08-08 18:05:58 +03:00
Kian-Meng Ang
78f8cad7c4 Fix typos 
Found via `codespell -L poped`
 2023-08-08 18:05:25 +03:00
Mohammed Tayeh
7942a540cd fix styling errors 
Signed-off-by: Mohammed Tayeh <m.tayeh94@gmail.com>
 2023-08-08 18:05:02 +03:00
Mohammed Tayeh
cb9cf6002f add stats command 
Signed-off-by: Mohammed Tayeh <info@tayeh.me>
 2023-08-08 18:05:02 +03:00
Evedel
06587c1dca rm redundant tests 
Signed-off-by: Evedel <svbiriukov@gmail.com>
 2023-08-02 14:19:15 +03:00
Evedel
bc9168b039 add no-normalize flag 
Signed-off-by: Evedel <svbiriukov@gmail.com>
 2023-08-02 14:19:15 +03:00
Sergei Biriukov
57c527c2c9 add edits from review 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
 2023-08-02 14:19:15 +03:00
Sergei Biriukov
d1f5ac9edc convert build context path to absolute during final normalisation 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
 2023-08-02 14:19:15 +03:00
Natanael Arndt
0164c1db56 Simplify the fix using or. 
Signed-off-by: Natanael Arndt <arndtn@gmail.com>
 2023-07-26 17:32:14 +03:00
Natanael Arndt
e5cdce4e7d default to an empty dict for the from service if the service is None 
Signed-off-by: Natanael Arndt <arndtn@gmail.com>
 2023-07-26 17:32:14 +03:00
Muayyad alsadi
f75d12af21 broken in py 3.7 2023-07-18 13:23:55 +03:00
Hedayat Vatankhah
5454c3ad0f Add 'links' aliases to container aliases 
Signed-off-by: Hedayat Vatankhah <hedayat.fwd@gmail.com>
 2023-07-18 13:14:57 +03:00
Hedayat Vatankhah
901adf47d0 Use defined environment variables in the image build process 
Build images with service environment variables defined so that they can be
used in the build process

Signed-off-by: Hedayat Vatankhah <hedayat.fwd@gmail.com>
 2023-07-18 13:13:33 +03:00
Mahmoud Abduljawad
bf07e91163 Implement include from compose-spec 
Signed-off-by: Mahmoud Abduljawad <mahmoud@masaar.com>
 2023-07-18 13:05:46 +03:00
Hedayat Vatankhah
c31b4e2816
Fixes #723: merge short & long syntax of depends_on dependencies 
Signed-off-by: Hedayat Vatankhah <hedayat.fwd@gmail.com>
 2023-07-08 04:10:43 +03:30
Sergei Biriukov
cfd24cc2e8 Merge branch 'devel' into allow-config-to-merge-strings-and-dicts-in-build 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
 2023-05-06 18:14:44 +10:00
Sergei Biriukov
79bfad103c move logic from rec_merge to normalize_service 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
 2023-05-06 10:42:44 +03:00
Sergei Biriukov
d1509468c3 allow empty list to be a command/entrypoint 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
 2023-05-06 10:42:44 +03:00
Sergei Biriukov
9011e9faa1 add tests, dry up code, use shlex.split instead of str.split 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
 2023-05-06 10:42:44 +03:00
Sergei Biriukov
517aeba330 Allow config to merge strings and lists in command and entrypoint 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
 2023-05-06 10:42:44 +03:00
Sergei Biriukov
85d5d5dcc9 move logic from rec_merge to normalize_service 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
 2023-05-06 15:17:54 +10:00
Sergei Biriukov
8c66b1cda7 add test case for when build is a complex dictionary 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
 2023-04-30 15:37:52 +10:00
Sergei Biriukov
a0005db474 add code implementing build value merge 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
 2023-04-29 13:52:19 +10:00
Sergei Biriukov
a61945b516 fix format 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
 2023-04-21 20:47:53 +03:00
Sergei Biriukov
6b6330c587 add build subcommand and --build arg to compose_run 
Signed-off-by: Sergei Biriukov <svbiriukov@gmail.com>
 2023-04-21 20:47:53 +03:00
BugFest
5a3bdbf89b Exit code managed at PodmanCompose.run() 
Signed-off-by: BugFest <bugfest.dev@pm.me>
 2023-04-12 22:25:33 +03:00
BugFest
1eb166445b Linting fixes 
Signed-off-by: BugFest <bugfest.dev@pm.me>
 2023-04-12 22:25:33 +03:00
BugFest
82182b7bc6 Finish execution in compose_build only on command=build calls 
Signed-off-by: BugFest <bugfest.dev@pm.me>
 2023-04-12 22:25:33 +03:00
BugFest
91bc6ebdb4 Keep chdir after loading env file 
Signed-off-by: BugFest <bugfest.dev@pm.me>
 2023-04-10 14:14:14 +03:00
BugFest
59a59c1a3a Fixes #636: env-file shall be resolved relative to the CWD 
Signed-off-by: BugFest <bugfest.dev@pm.me>
 2023-04-10 14:14:14 +03:00
BugFest
6f902faed0 Fix linting issues 
Signed-off-by: BugFest <bugfest.dev@pm.me>
 2023-04-10 14:12:32 +03:00
Muayyad Alsadi
ccdf01e9b0 Revert "Use SELinux mount flag for secrets" 
This reverts commit 874192568f.
 2023-04-10 12:26:53 +03:00
Muayyad Alsadi
e6b1eabe4c Revert "Use more lenient SELinux mount flag for secrets" 
This reverts commit 75de39c239.
 2023-04-10 12:26:53 +03:00
Henry Reed
75de39c239 Use more lenient SELinux mount flag for secrets 
Signed-off-by: Henry Reed <60915078+henryreed@users.noreply.github.com>
 2023-04-10 12:25:53 +03:00