extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2024-11-22 16:03:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
687 Commits 3 Branches 9 Tags 13 MiB
fa3e0a7772
Commit Graph

85 Commits

Author SHA1 Message Date
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
Mahmoud Abduljawad
bf07e91163 Implement include from compose-spec 
Signed-off-by: Mahmoud Abduljawad <mahmoud@masaar.com>
 2023-07-18 13:05:46 +03:00
BugFest
5d279c4948 Build-fail test example 
Signed-off-by: BugFest <bugfest.dev@pm.me>
 2023-04-12 22:25:33 +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
3f4618866b Update project-1.env 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
Bhavin Gandhi
0b853f29f4 Ignore access mode when merging volumes short syntax 
The target path inside the container is treated as a key. Ref:
https://github.com/compose-spec/compose-spec/blob/master/spec.md#merging-service-definitions

Signed-off-by: Bhavin Gandhi <bhavin7392@gmail.com>
 2023-04-10 12:25:05 +03:00
waechtjn
847f01a6c6 Add a docker-compose test file for uidmaps/gidmaps 
Add a simple docker-compose.yml test to use the x-podman extension with
uidmaps and gitmaps
 2023-04-10 12:22:25 +03:00
Dixon Whitmire
13856d2e9c updating black formatting 
Signed-off-by: Dixon Whitmire <dixonwh@gmail.com>
 2023-04-10 12:12:18 +03:00
Dixon Whitmire
8d8df0bc28 Adding basic support for --profile argument 
Signed-off-by: Dixon Whitmire <dixonwh@gmail.com>
 2023-04-10 12:12:18 +03:00
BugFest
016c97fd1e Fixes #663 - Fixes linting/pylint errors 
Signed-off-by: BugFest <bugfest.dev@pm.me>
 2023-04-10 11:53:47 +03:00
Muayyad alsadi
9046f7eee0 #634: follow up 2023-04-09 12:00:45 +03:00
Dixon Whitmire
08ffcf6126 updating test_podman_compose_extends_w_file_subdir to use the correct image name 
Signed-off-by: Dixon Whitmire <dixonwh@gmail.com>
 2022-10-28 00:13:56 +02:00
Muayyad alsadi
7b99b38f0e nethost test 2022-03-19 00:17:22 +03:00
Muayyad alsadi
3b7bf81051 remove unused test 2022-03-08 10:47:16 +03:00