f11e08eaac
Read log output by chunks if a line is too long
...
Fixes #1096 .
Modified-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Yusuke Matsubara <whym@whym.org>
2025-01-05 12:28:13 +02:00
9964604b17
Extract container_to_build_args()
...
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
2024-12-30 00:52:45 +02:00
ac7ec5c166
Support network level mac_address attribute
...
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-29 22:59:58 +08:00
346f7a57f0
Ignore creating networks on network_mode=bridge.
...
When using bridge mode, podman-compose will use the default `podman` network.
We do not need to create this network, so just return as other network_mode.
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-21 22:52:37 +02:00
55642247e3
Add integration test for network scoped aliases
...
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-21 22:52:37 +02:00
978a1381bc
Support network scoped service aliases
...
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-21 22:52:37 +02:00
4a232f5e32
Merge single and multi network handling in get_net_args_from_networks()
...
The behavior has not changed, single-network has a special case.
Modified-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-18 20:00:17 +02:00
aa8c6fd598
Simplify network handling in get_net_args_from_networks()
...
Note that multiple_nets is now guaranteed to be not empty in processing
stage.
Modified-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-18 20:00:15 +02:00
fb0bbd6fe1
Cleanup network alias processing
...
Modified-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-18 20:00:13 +02:00
b324029f25
Simplify network name processing when there is single network
...
Modified-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-18 20:00:11 +02:00
590c371db2
Move network alias processing to common location
...
Modified-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-18 20:00:06 +02:00
16196a1f6d
Simplify ip address processing in get_net_args_from_networks()
...
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
2024-12-18 19:59:28 +02:00
2dfbb59097
Extract multiple network handling in get_net_args_from_networks()
...
Modified-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-18 19:59:27 +02:00
a34d1d1a31
Remove unused ip_assignments in get_net_args_from_networks()
...
Modified-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-18 19:59:26 +02:00
d6da65e6c9
Extract get_net_args_from_networks()
...
Modified-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-18 19:59:25 +02:00
de2c33d7ae
Simplify get_net_args_from_network_mode()
...
This commit takes into account that network_mode won't have networks
attribute set, accordingly get_net_args_from_network_mode() can
calculate complete net_args easily.
Modified-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-18 19:59:24 +02:00
2891be01d7
Ensure that network_mode and networks are not present at the same time
...
See
https://docs.docker.com/reference/compose-file/services/#network_mode
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
2024-12-18 19:59:23 +02:00
a023dc145b
Extract get_net_args_from_network_mode()
...
Modified-by: Povilas Kanapickas <povilas@radix.lt>
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-18 19:59:22 +02:00
2cfc617f9e
Support docker-compose like default network behavior
...
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-12-18 08:48:21 +08:00
054c66b568
Add device_cgroup_rules support
...
"device_cgroup_rules: []" is defined in the Compose file specification,
and corresponds to "podman run --device-cgroup-rule="
Signed-off-by: Jeremy Visser <jeremy@visser.name>
2024-12-06 08:19:54 +11:00
145ae47c48
Simplified statements to retrieve keys from dictionaries
...
Signed-off-by: Felix Rubio <felix@kngnt.org>
2024-12-02 22:13:10 +02:00
a67fa0beb5
Adding support for conditional dependencies
...
Signed-off-by: Felix Rubio <felix@kngnt.org>
2024-12-02 22:13:10 +02:00
3ba0396e7a
Normalize depends_on service property
...
Signed-off-by: Felix Rubio <felix@kngnt.org>
Modified-by: Povilas Kanapickas <povilas@radix.lt>
2024-12-02 22:08:48 +02:00
973e15ba23
Wrap dependencies within a class
...
Signed-off-by: Felix Rubio <felix@kngnt.org>
Modified-by: Povilas Kanapickas <povilas@radix.lt>
2024-12-02 22:08:48 +02:00
002c2e400b
Extract run_container()
...
Signed-off-by: Felix Rubio <felix@kngnt.org>
Modified-by: Povilas Kanapickas <povilas@radix.lt>
2024-12-02 22:00:59 +02:00
db0aad97bd
podman-compose down removes networks
...
Fixes #490
Signed-off-by: Timon de Groot <timon.degroot@hypernode.com>
2024-10-21 08:31:09 +02:00
a3fb4b373a
Merge pull request #1058 from banditopazzo/705-ssh-key-support-in-build
...
feat: add support for ssh property in the build command
2024-10-15 03:18:41 +03:00
ab33954f6c
add ssh support for build command
...
Fixes #705 : Add support for ssh property in the build command
Signed-off-by: Domenico Salvatore <banditopazzo@gmail.com>
2024-10-15 00:35:10 +02:00
90f54b9ca5
Add x-podman.no_hosts extension
...
Signed-off-by: Timon de Groot <timon.degroot@hypernode.com>
2024-10-14 17:02:36 +02:00
4a7329b9e3
Revert "Use defined environment variables in the image build process"
...
This reverts commit 901adf47d0fixes #985 and #931
Signed-off-by: Chris Shucksmith <chris@shucksmith.co.uk>
2024-09-06 23:12:09 +03:00
ea239c4b77
Simplify secrets assignment
...
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
2024-08-03 01:01:16 +00:00
9fdee76858
Initialize default values in PodmanCompose constructor
...
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
2024-08-03 01:01:08 +00:00
0a6e0a35e1
Fix services replicas type
...
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
2024-08-03 01:00:40 +00:00
26e6651d6c
Type hints via annotations
...
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
2024-08-03 01:00:36 +00:00
462603383c
Remove is_dict,is_str for better pyright inference
...
When support for python3.8 and python3.9 has been dropped, it will be possible to eat the cak and
have it due to PEP-647.
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
2024-08-03 01:00:30 +00:00
ed58ac0879
clean up redundant default_net variable
...
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
2024-08-01 23:16:13 +00:00
305f25b4d6
clean up redundant proj_name
...
- remove unutilized proj_name parameter from volume_ls
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
proj_name
2024-08-01 23:16:13 +00:00
585d344d0a
Merge pull request #1004 from lisongmin/substitution-with-service-environment
...
Substitution with service environment
2024-07-27 00:06:46 +03:00
b5eaf314ad
Support variable substitution with service's environment
...
This commit introduces the ability to substitute environment variables
within the 'environment' section of the service definition.
This allows for more dynamic configuration of services.
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
2024-07-27 00:04:06 +03:00
b3c49df6eb
podman_compose.py: support "platform" property in the build command
...
This was already added to container_to_args() in https://github.com/containers/podman-compose/pull/470
which is used for the 'up' and 'run' commands.
Definition in the schema: https://github.com/compose-spec/compose-spec/blob/main/schema/compose-spec.json#L329
Signed-off-by: Beat Küng <beat-kueng@gmx.net>
2024-07-26 23:58:11 +03:00
7d7e64fe5a
Update docs+messages to reflect uidmaps/gidmaps code
...
Signed-off-by: Jason Chua <jasonc1804@gmail.com>
2024-07-22 20:54:41 -07:00
e2eb883709
Add `--network=none` if `network_mode: none` is set; fixes #1001 .
...
Signed-off-by: bg <bg@nerilex.org>
2024-07-17 01:41:04 +03:00
85050097e5
Support python direct call _parse_args or run
...
For example:
```
>>> from podman_compose import podman_compose
>>> podman_compose._parse_args(['version'])
>>> podman_compose.run(['help'])
```
Signed-off-by: Mingzhe Zou <zoumingzhe@qq.com>
2024-07-15 12:04:39 +08:00
ca58d7cd58
Pass build description labels to podman build
...
The Compose Specification supports adding labels to the build image
which is also used in practice. Support this and pass the labels to
`podman build`.
Signed-off-by: Sebastian Wick <sebastian.wick@redhat.com>
2024-07-08 19:15:16 +03:00
f0bae1e2d9
Don't resolve links to compose file
...
docker-compose uses the path to the compose file even if it's symlink to
get the context directory.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
2024-03-25 08:18:52 +02:00
5bf4c0fdbe
Add a way to remove dashes in default network names
...
This is the behavior exhibited by docker compose. The network names are
user-visible through external networks, so previously anyone who
migrated from docker-compose needed to change their configuration. Now
it is possible to select compatibility via a flag in x-podman global
dictionary.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
2024-07-06 18:50:25 +03:00
67c5352c3a
Extract default_network_name_for_project()
...
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
2024-07-06 18:32:09 +03:00
24038dace3
Check whether pod exists before trying to create one
...
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
2024-07-03 19:31:13 +03:00
fa3e0a7772
Alt Dockerfile names fix
...
Signed-off-by: Michaël Nass - PlugN <michael.nass@free.fr>
2024-06-26 19:09:20 +02:00
d38b26bb01
Release 1.2.0
...
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
2024-06-26 10:43:28 +03:00
4e9f76768c
Load .env from Compose file's directory and cwd
...
This commit loads dotenv `.env` (exactly that name) from the following location (the later takes
precedence):
- The `.env` file in the Compose file's directory.
- The `.env` file in the current working directory (invoking podman-compose).
This preserves the behavior prior to 1.1.0 and to match with Docker Compose CLI.
Fix: https://github.com/containers/podman-compose/issues/937
Signed-off-by: Genzer <732937+Genzer@users.noreply.github.com>
2024-06-24 23:29:56 +03:00
405001b990
Fix comment
...
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
2024-06-24 21:24:34 +03:00
546cad5171
Add type=env secret support
...
Signed-off-by: Brett Calliss <brett@obligatory.email>
2024-06-24 20:12:44 +03:00
935029dc33
Fix environment variable precedents
...
Per https://docs.docker.com/compose/environment-variables/envvars-precedence/#advanced-example
Signed-off-by: nathanael.noblet <nathanael.noblet@willowglensystems.com>
2024-06-22 19:58:02 +03:00
80b2aa6ed0
Merge pull request #964 from mokibit/set-custom-in_pod-in-compose-file
...
Allow providing custom in_pod argument as a global compose file variable
2024-06-20 09:45:41 +03:00
360b85bf2d
Allow providing custom in_pod argument as a global compose file variable
...
Default command line argument `in_pod` was set to True, but this breaks
the compose file for users who want to use `--userns` argument. This
commit sets default `in_pod` value to None, and later resolves whether
to create a pod by checking compose file, as new argument in compose
file x-podman is now available. Now it is convenient for users to pass
custom `in_pod` value (True or False) as a compose file argument when
command line value of `in_pod` is not provided.
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
2024-06-20 09:42:22 +03:00
82740cc311
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
0f645e4c70
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
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
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
e799a0b0ea
Fix x-podman.gidmap typo
...
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
2024-06-14 17:31:55 +03:00
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
cac836b0f5
Support additional_contexts
...
Signed-off-by: Otto Liljalaakso <otto.liljalaakso@novatron.fi>
2024-05-21 19:44:37 +03:00
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
23ad5c3ef7
Merge pull request #920 from mokeyish/gpu
...
Add supoort for enabling GPU access
2024-05-19 11:12:34 +03:00
1d64f2cf8c
Update podman_compose.py
...
fix #940
Signed-off-by: Zhen Liu <lzhen.dev@outlook.com>
2024-05-18 20:33:10 +08:00
4e22faefd6
Fix logging build error message
...
Signed-off-by: Hedayat Vatankhah <hedayat.fwd@gmail.com>
2024-05-13 15:13:40 +03:00
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
79865c2e13
Add support for enabling GPU access
...
Signed-off-by: YISH <mokeyish@hotmail.com>
2024-05-07 10:32:24 +08:00
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
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
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
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
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
eea8bac496
Add images command
...
Signed-off-by: Mohammed Tayeh <m.tayeh94@gmail.com>
2024-04-28 19:04:23 +03:00
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
77f2e8e5b0
Support podman's external rootfs management
...
Signed-off-by: GnSight <ftyg@live.com>
2024-04-28 17:55:39 +03:00
72a94d5185
implement --publish in docker-compose run
...
Signed-off-by: Denis Ledoux <dle@odoo.com>
2024-04-28 00:54:35 +02:00
2681566580
Release 1.1.0
2024-04-19 12:37:30 +03:00
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
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
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
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
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
6c09ce710e
FIX issue https://github.com/containers/podman-compose/issues/704 - Windows fix sock not working.
2024-04-07 16:28:45 +10:00
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
6feff244db
slirp4netns can be used without options
...
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
2024-03-28 16:09:43 +02:00
65849c95e2
add comment about per-network aliases
...
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
2024-03-28 16:09:43 +02:00
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
bdff78dcba
Ignore files generated by tests
...
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
2024-03-28 16:09:43 +02:00
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
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
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
f18c8092cc
Merge pull request #887 from baszoetekouw/fix-oldpython
...
Fix support for older python versions
2024-03-09 23:29:32 +02:00
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
fde7995cb8
Fix python < 3.11 compatibility
...
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
2024-03-09 22:26:36 +01:00
688ee9a104
Fix pylint issues
...
Signed-off-by: Bas Zoetekouw <bas.zoetekouw@surf.nl>
2024-03-09 22:26:35 +01:00
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
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
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
Yusuke Matsubara
Povilas Kanapickas
Songmin Li
Jeremy Visser
Felix Rubio
Timon de Groot
banditopazzo
Chris Shucksmith
legobt
Beat Küng
Jason Chua
bg
Mingzhe Zou
Sebastian Wick
Michaël Nass - PlugN
Genzer
Monika Kairaityte
Brett Calliss
nathanael.noblet
Artho Pacini
Hedayat Vatankhah
Otto Liljalaakso
Muayyad Alsadi
Zhen Liu
YISH
fccagou
Alexandre Germain
Johannes
Winston
Mohammed Tayeh
GnSight
Denis Ledoux
Cam Spiers
charliemirabile
AndrweCottrell
Bas Zoetekouw
wiehe
Ari Pollak