extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-02-14 17:30:45 +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
Songmin Li
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
Songmin Li
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
Songmin Li
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
Povilas Kanapickas
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
Songmin Li
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
Songmin Li
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
Songmin Li
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
Songmin Li
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
Povilas Kanapickas
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
Songmin Li
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
Songmin Li
2cfc617f9e
Support docker-compose like default network behavior 
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
 2024-12-18 08:48:21 +08:00
Jeremy Visser
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
Felix Rubio
145ae47c48 Simplified statements to retrieve keys from dictionaries 
Signed-off-by: Felix Rubio <felix@kngnt.org>
 2024-12-02 22:13:10 +02:00
Felix Rubio
a67fa0beb5 Adding support for conditional dependencies 
Signed-off-by: Felix Rubio <felix@kngnt.org>
 2024-12-02 22:13:10 +02:00
Felix Rubio
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
Felix Rubio
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
Felix Rubio
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
Timon de Groot
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
Povilas Kanapickas
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
banditopazzo
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
Timon de Groot
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
Chris Shucksmith
4a7329b9e3 Revert "Use defined environment variables in the image build process" 
This reverts commit 901adf47d0.
fixes #985 and #931

Signed-off-by: Chris Shucksmith <chris@shucksmith.co.uk>
 2024-09-06 23:12:09 +03:00
legobt
ea239c4b77
Simplify secrets assignment 
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
 2024-08-03 01:01:16 +00:00
legobt
9fdee76858
Initialize default values in PodmanCompose constructor 
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
 2024-08-03 01:01:08 +00:00
legobt
0a6e0a35e1
Fix services replicas type 
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
 2024-08-03 01:00:40 +00:00
legobt
26e6651d6c
Type hints via annotations 
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
 2024-08-03 01:00:36 +00:00
legobt
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
legobt
ed58ac0879
clean up redundant default_net variable 
Signed-off-by: legobt <6wbvkn0j@anonaddy.me>
 2024-08-01 23:16:13 +00:00
legobt
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
Povilas Kanapickas
585d344d0a
Merge pull request #1004 from lisongmin/substitution-with-service-environment 
Substitution with service environment
 2024-07-27 00:06:46 +03:00
Songmin Li
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
Beat Küng
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
Jason Chua
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
bg
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
Mingzhe Zou
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
Sebastian Wick
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
Povilas Kanapickas
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
Povilas Kanapickas
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
Povilas Kanapickas
67c5352c3a Extract default_network_name_for_project() 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-07-06 18:32:09 +03:00
Povilas Kanapickas
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
Michaël Nass - PlugN
fa3e0a7772 Alt Dockerfile names fix 
Signed-off-by: Michaël Nass - PlugN <michael.nass@free.fr>
 2024-06-26 19:09:20 +02:00
Povilas Kanapickas
d38b26bb01
Release 1.2.0 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-06-26 10:43:28 +03:00
Genzer
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
Monika Kairaityte
405001b990 Fix comment 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-06-24 21:24:34 +03:00
Brett Calliss
546cad5171 Add type=env secret support 
Signed-off-by: Brett Calliss <brett@obligatory.email>
 2024-06-24 20:12:44 +03:00
nathanael.noblet
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
Povilas Kanapickas
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
Monika Kairaityte
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
Artho Pacini
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
Artho Pacini
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