extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-05-17 20:50:53 +02:00
Code Issues Packages Projects Releases Wiki Activity
959 Commits 3 Branches 11 Tags 23 MiB
98f166d2e4
Commit Graph

200 Commits

Author SHA1 Message Date
Monika Kairaityte
3093b00326 tests/integration: Move test "include" to corresponding directory 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 02:11:46 +02:00
Monika Kairaityte
1c21d655ba tests/integration: Move test "in_pod" to corresponding directory 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 02:11:46 +02:00
Monika Kairaityte
18e5fd64f3 tests/integration: Move test "filesystem" to corresponding dir 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 02:11:46 +02:00
Monika Kairaityte
24bdfd1e17 tests/integration: Move test "extends_w_file_subdir" to corresp. dir 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 02:11:46 +02:00
Monika Kairaityte
c2d3e156c2 tests/integration: Move test "extends_w_file" to corresponding directory 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 02:11:46 +02:00
Monika Kairaityte
ba95100cff tests/integration: Move test "extends_w_empty_service" to corresp. dir 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 02:11:46 +02:00
Monika Kairaityte
6022669991 tests/integration: Move test "extends" to corresponding directory 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 02:01:44 +02:00
Monika Kairaityte
e29df71d42 tests/integration: Move test "exit_from" to corresponding directory 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 02:01:44 +02:00
Monika Kairaityte
21b9d385b2 tests/integration: Move test "deps" to corresponding directory 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 01:48:47 +02:00
Monika Kairaityte
4c17ce2434 tests/integration: Move test "default_net_behavior" to corresponding dir 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 01:48:47 +02:00
Monika Kairaityte
09d54e9dcc tests/integration: Move test "build_secrets" to corresponding directory 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 01:48:47 +02:00
Monika Kairaityte
f1dd9b374e tests/integration: Move test "build_fail" to corresponding directory 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 01:48:47 +02:00
Monika Kairaityte
87af67fe94 tests/integration: Move test "network_scoped_aliases" to corresp. dir 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 01:48:47 +02:00
Monika Kairaityte
f1d663874e tests/integration: Move test "build" to corresponding directory 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 01:48:47 +02:00
Monika Kairaityte
69ffff33f6 tests/integration: Move test "additional_contexts" to corresp. dir 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2025-01-23 01:48:47 +02:00
Povilas Kanapickas
f376700972
Merge pull request #1104 from rjeffman/disable_dns 
Add support for disable_dns, dns and ignore on network creation
 2025-01-19 19:41:30 +02:00
Rafael Guterres Jeffman
9be3ec985f Add network "dns" support 
This patch add 'x-podman.dns' option to the 'network' configuration,
allowing users to set the DNS resolvers for a defined network.

Signed-off-by: Rafael Guterres Jeffman <rjeffman@redhat.com>
 2025-01-17 13:58:13 -03:00
Rafael Guterres Jeffman
6e642dca1f Add network "disable-dns" support 
Podman allows to create a network disabling the DNS plugin with
'--disable-dns', but this option is not available in the compose spec.

This patch add 'x-podman.disable-dns' to the podman-compose options,
allowing the creation of a network with the DNS plugin disabled.

Signed-off-by: Rafael Guterres Jeffman <rjeffman@redhat.com>
 2025-01-17 12:14:15 -03:00
indra
2aa042b9c7 expand service environment_variables before adding to subs_dict 
Also modifies an existing integration test to expect an empty string as `docker-compose` warns that
`ZZVAR3` is not set and defaults it to an empty string per the acutal output here.

```yaml
$ docker-compose -f container-compose.load-.env-in-project.yaml config
WARN[0000] The "ZZVAR3" variable is not set. Defaulting to a blank string.
name: project
services:
  app:
    command:
      - /bin/busybox
      - sh
      - -c
      - env | grep ZZ
    environment:
      ZZVAR1: This value is loaded but should be overwritten
      ZZVAR2: This value is loaded from .env in project/ directory
      ZZVAR3: ""
...
```

Signed-off-by: indra <indra.talip@gmail.com>
 2025-01-16 21:00:49 +11:00
Emanuel Rietveld
bc4177fbdc Exclude dependent containers on up if --no-deps. 
Fixes #398.

Signed-off-by: Emanuel Rietveld <e.j.rietveld@gmail.com>
 2025-01-15 22:32:28 +01:00
Emanuel Rietveld
8206cc3ea2 Run should not add --requires if --no-deps. 
Fixes #717.

Signed-off-by: Emanuel Rietveld <e.j.rietveld@gmail.com>
 2025-01-15 22:29:51 +01:00
Felix Rubio
804852b218 Provide support for cache_from and cache_to fields 
Signed-off-by: Felix Rubio <felix@kngnt.org>
 2025-01-05 12:35:30 +02:00
Yusuke Matsubara
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
Povilas Kanapickas
35cf4bcb72 tests: Add test for container_to_build_args() 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-12-30 00:55:19 +02:00
Songmin Li
ac7ec5c166
Support network level mac_address attribute 
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
 2024-12-29 22:59:58 +08:00
Songmin Li
55642247e3 Add integration test for network scoped aliases 
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
 2024-12-21 22:52:37 +02:00
Songmin Li
978a1381bc Support network scoped service aliases 
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
 2024-12-21 22:52:37 +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
420d19daf4
Add integration test for default network behavior 
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
 2024-12-18 13:21:29 +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
a67fa0beb5 Adding support for conditional dependencies 
Signed-off-by: Felix Rubio <felix@kngnt.org>
 2024-12-02 22:13:10 +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
Monika Kairaityte
df8fa588a5 tests/integration: Automate manual 'nets_test2' test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-10-01 12:26:42 +03:00
Monika Kairaityte
5c81bbfcb7 tests/integration: Automate manual 'nets_test1' test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-09-29 14:44:17 +03:00
Povilas Kanapickas
22b0c4b348
Merge pull request #1040 from mokibit/automate-ipam-default-test 
tests/integration: Automate manual `ipam_default` test
 2024-09-26 21:41:49 +03:00
Monika Kairaityte
deed4d51b0 tests/integration: Automate manual 'ipam_default' test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-09-26 20:23:26 +03:00
Monika Kairaityte
08b3ac2633 tests/integration: Delete 'netprio' test 
This functionality is not implemented in podman-compose so the test is
unneeded.

Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-09-26 20:10:37 +03:00
Monika Kairaityte
0de7e13f1a tests/integration: Automate manual 'multicompose' test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-09-24 19:38:33 +03:00
Monika Kairaityte
cb294d7519 tests/integration: Automate manual 'nethost' test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-09-24 19:35:06 +03:00
Monika Kairaityte
8d0dd214ae tests/integration: Automate manual 'interpolation' test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-09-10 14:47:56 +03:00
Monika Kairaityte
de3f93c491 tests/integration: Relocate 'filesystem' test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-09-06 20:08:13 +03:00
Monika Kairaityte
f4bf69b68e tests/integration: Automate manual 'extends_w_file_subdir' test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-09-06 19:47:14 +03:00
Monika Kairaityte
124879a7b9 tests/integration: Automate manual 'extends_w_file' test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-09-05 15:25:33 +03:00
Monika Kairaityte
368efe2ee3 tests/integration: Automate manual 'extends_w_empty_service' test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-09-05 13:16:38 +03:00
Monika Kairaityte
dc04108b3e tests/integration: Automate manual 'extends' test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-08-01 21:29:43 +03:00
Povilas Kanapickas
348461ca77
Merge pull request #1007 from mokibit/automate-env-tests 
tests/integration: Automate manual `env` tests
 2024-07-30 14:09:55 +03:00
Monika Kairaityte
92dbd3690e tests/integration: Automate 'env-file-tests' manual tests 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-07-30 12:46:13 +02:00
Monika Kairaityte
9e11c6bfbc tests/integration: Automate manual 'exit-from' tests 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-07-30 09:40:20 +02:00
Monika Kairaityte
0d24c41afb tests/integration: Automate 'env-tests' manual test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-07-29 10:39:49 +02:00
Songmin Li
34f5268e37 Add unittest for rec_subs 
Signed-off-by: Songmin Li <lisongmin@protonmail.com>
 2024-07-27 00:04:06 +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
Monika Kairaityte
3c9c18c6e0 tests/integration: Automate deps manual test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-07-22 15:19:34 +02: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
Monika Kairaityte
9fe30387ee tests/integration: Automate 'build_fail' manual test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-07-08 21:37:29 +02:00
Monika Kairaityte
0f8348bea7 tests/integration: Automate 'build' manual test 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-07-08 21:36:29 +02: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
5040a37d47 tests: Add integration tests for up -d with single container at a time 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-07-06 00:59:50 +03:00
Povilas Kanapickas
9a4af0ce62 Discover tests instead of passing a list of files to unittest 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-07-03 19:50:13 +03:00
Monika Kairaityte
2056e703d5 tests/integration: Reduce base path calculation duplication 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-07-03 09:09:25 +03:00
Monika Kairaityte
4ec57c1013 unittests: Added unit tests for podman-compose secrets 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-07-02 20:26:58 +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
18472b53ac Move all tests to single directory "tests" 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-06-26 11:28:16 +03:00
Genzer
67ce900885 Commit .env in tests/env-file-tests, bypassing root .gitignore 
This commit adds a .gitignore in tests/env-file-tests to allow .env files
to be committed.

Fix: #937
Signed-off-by: Genzer <732937+Genzer@users.noreply.github.com>
 2024-06-24 23:29:57 +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
Brett Calliss
f06975b346 Update tests for type=env secret 
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
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
Monika Kairaityte
040b73adab pytests: Add tests for several multi-line environment files 
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
 2024-05-29 00:09: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
Zhen Liu
0065082db9 refine the test_include for multi subcomposes 
Signed-off-by: Zhen Liu <lzhen.dev@outlook.com>
 2024-05-21 11:28:27 +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
Zhen Liu
4f73f2b79e fix: add include test file, edit the assertion 
Signed-off-by: Zhen Liu <lzhen.dev@outlook.com>
 2024-05-18 21:23:43 +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
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
3e1f7d554b add tests for selinux with verbose bind mount 
based on seccomp test. Without the selinux option, visiting localhost:8080
will give a 404 error because httpd cannot access the file, but with selinux: z
the context for the file will be appropriately updated so httpd can access it

Signed-off-by: charliemirabile <46761267+charliemirabile@users.noreply.github.com>
 2024-04-10 15:29:03 -04: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
dd34a90068 Add testcase for failing network config 
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
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
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
b0da6f82d3 Fix import formatting 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 23:46:19 +02:00
Povilas Kanapickas
1a24cde608 tests: Properly tear down containers in extends_w_file_subdir test 
podman rmi does not guarantee that the container itself is shut down.

Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 15:52:40 +02:00
Povilas Kanapickas
27c8cebbdc tests: Add verbose debug option via env variable 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 15:34:00 +02:00
Povilas Kanapickas
0614687840 tests: Print decoded subprocess output in case of failure 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 15:11:25 +02:00
Povilas Kanapickas
6af7a2d691 tests: Optimize speed by using dumb-init to handle SIGTERM signal 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 14:45:53 +02:00
Povilas Kanapickas
f4dc5f3b93 tests: Print output in case subprocess returns unexpected code 
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 13:14:02 +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
23fe9e7e1d Migrate tests to unittest 
unittest is much more straightforward without any magic. In a small
project like podman-compose being easy to understand is more important
than features.

Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
 2024-03-08 11:33:17 +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
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
Natanael Arndt
280f1770bf Add a test to extend using an empty service (placeholder) 
Signed-off-by: Natanael Arndt <arndtn@gmail.com>
 2023-07-26 17:32:14 +03:00