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
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
84f7fdd7da
Merge pull request #971 from mokibit/type-env-secret-support
...
Add support for environment variable secrets
2024-06-24 23:17:34 +03:00
405001b990
Fix comment
...
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
2024-06-24 21:24:34 +03:00
6b1aeff55f
Add unittests for type=env secret
...
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
2024-06-24 21:24:34 +03:00
f06975b346
Update tests for type=env secret
...
Signed-off-by: Brett Calliss <brett@obligatory.email>
2024-06-24 20:12:44 +03:00
546cad5171
Add type=env secret support
...
Signed-off-by: Brett Calliss <brett@obligatory.email>
2024-06-24 20:12:44 +03:00
e07c28d127
Merge pull request #771 from wgnathanael/environment-precedence
...
Fix environment variable precedents
2024-06-22 20:00:08 +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
650a835eca
Merge pull request #966 from ArthoPacini/enhance/stdin-docker-compose-support
...
Add ability to input docker-compose.yaml via stdin
2024-06-19 20:06:15 +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
14f39e5b86
Merge pull request #965 from mokibit/fix-gidmap-typo
...
Fix x-podman.gidmap typo
2024-06-17 10:08:17 +03:00
e799a0b0ea
Fix x-podman.gidmap typo
...
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
2024-06-14 17:31:55 +03:00
6d8d3e94fe
Merge pull request #960 from mokibit/github-verbose-integration-tests
...
github: Add verbose option to integration tests
2024-06-08 20:15:13 +03:00
65d1fdeaa3
github: Add verbose option to integration tests
...
Currently it is not possible to see which test output corresponds to
which test exactly. Now before each new test its test name is printed.
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
2024-06-08 20:05:12 +03:00
d905a7c638
Merge pull request #949 from mokibit/multiline-env-file
...
Add support for multi-line environment files
2024-05-29 00:47:58 +03:00
2e8ed2f924
pytests: Add test for object required but path non existent
...
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
2024-05-29 00:09:22 +03:00
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
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
04b107805a
Merge pull request #954 from mokibit/fix-codespelling-update
...
github/workflows: Fix automatic codespelling update
2024-05-28 23:40:59 +03:00
2c5d00d3e7
github/workflows: Add codespellignore file to address false positives
...
Signed-off-by: Monika Kairaityte <monika@kibit.lt>
2024-05-28 20:20:33 +03:00
cac90f69b8
Merge pull request #946 from charliemirabile/selinux_tests
...
Missing SELinux tests
2024-05-22 10:17:05 +03:00
b513f50f30
test: add missing unit tests for selinux in verbose mount
...
Support for setting the selinux flags on a bind mount specified using
the verbose syntax was merged as part of #911 , but at that time the PR
lacked unit tests. This commit adds the missing tests
Signed-off-by: charliemirabile <46761267+charliemirabile@users.noreply.github.com>
2024-05-21 19:43:03 -04:00
8f618b6fab
Merge pull request #763 from otto-liljalaakso-nt/additional_contexts
...
Support additional_contexts
2024-05-21 19:49:23 +03:00
cac836b0f5
Support additional_contexts
...
Signed-off-by: Otto Liljalaakso <otto.liljalaakso@novatron.fi>
2024-05-21 19:44:37 +03:00
3bb305cef4
Merge pull request #945 from p12tic/split-gpu-test
...
test: Split test_gpu test
2024-05-21 12:25:11 +03:00
09034a0c38
test: Split test_gpu test
...
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
2024-05-21 12:04:32 +03:00
e668a339ce
Merge pull request #943 from HernandoR/fix/multi-sub-composes
...
Fix the test_include for multi subcomposes
2024-05-21 11:32:17 +03:00
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
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
45efe461b0
Merge pull request #941 from HernandoR/patch-1
...
Update podman_compose.py
2024-05-19 11:10:39 +03:00
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
1d64f2cf8c
Update podman_compose.py
...
fix #940
Signed-off-by: Zhen Liu <lzhen.dev@outlook.com>
2024-05-18 20:33:10 +08:00
2ce6d1a1e7
Merge pull request #933 from hedayat/fix-build-error-log
...
Fix logging build error message
2024-05-13 16:24:15 +03: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
33d7d35a4d
Merge pull request #851 from fccagou/fix-ipam-driver-default
...
fix(ipam_driver): do not pass --ipam-driver option when value set to …
2024-05-06 17:31:59 +03: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
36a3d3c207
Merge pull request #925 from GerkinDev/feat/env-file-object
...
Fixes #897 : support `env_file` as objects
2024-05-06 16:57:25 +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
35cbc49160
Merge pull request #928 from schugabe/patch-1
...
add await for create_pods call
2024-05-06 14:00:29 +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
0ee7c2630a
Merge pull request #641 from DaniruKun/devel
...
Add instructions on install from Homebrew
2024-05-04 18:03:43 +03:00
Genzer
Povilas Kanapickas
Monika Kairaityte
Brett Calliss
nathanael.noblet
Artho Pacini
Hedayat Vatankhah
charliemirabile
Otto Liljalaakso
Zhen Liu
Muayyad Alsadi
YISH
fccagou
Alexandre Germain
Johannes