0f8348bea7
tests/integration: Automate 'build' manual test
...
Signed-off-by: Monika Kairaityte <monika@kibit.lt >
2024-07-08 21:36:29 +02:00
55ab3fa7f7
Merge pull request #994 from swick/wip/build-labels
...
Pass build description labels to podman build
2024-07-08 19:20:22 +03:00
2091ade7b1
Add newsfragment
...
Signed-off-by: Povilas Kanapickas <povilas@radix.lt >
2024-07-08 19:15:16 +03: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
3296c8d34f
Merge pull request #993 from p12tic/compose-file-links
...
Don't resolve links to compose file
2024-07-06 19:35:18 +03:00
dab6b1b98d
Merge pull request #992 from p12tic/docker-compose-name-compat
...
Add a way to remove dashes in default network names
2024-07-06 18:56:25 +03: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
5e0f7e5e19
Merge pull request #990 from p12tic/tests-single-container-up
...
tests: Add integration tests for up -d with single container at a time
2024-07-06 01:06:23 +03:00
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
c82859b89f
Merge pull request #989 from p12tic/github-install-requirements-unconditionally
...
github: Install requirements unconditionally
2024-07-04 09:19:30 +03:00
29195be77c
github: Install requirements unconditionally
...
This makes tests less brittle as any renames to requirements files will
be noticed.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt >
2024-07-04 09:17:27 +03:00
1c74d6cd11
Merge pull request #988 from p12tic/tests-discovery
...
Discover tests instead of passing a list of files to unittest
2024-07-03 19:52:56 +03:00
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
0517b9e34c
Merge pull request #987 from p12tic/check-if-pod-exists-before-creating
...
Check whether pod exists before trying to create one
2024-07-03 19:35:28 +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
0ea4cbe091
Merge pull request #984 from mokibit/reduce-path-calculation-duplication
...
tests/integration: Reduce base path calculation duplication
2024-07-03 09:13:49 +03:00
2056e703d5
tests/integration: Reduce base path calculation duplication
...
Signed-off-by: Monika Kairaityte <monika@kibit.lt >
2024-07-03 09:09:25 +03:00
137c6207b2
Merge pull request #981 from mokibit/add-unittests-for-secrets
...
unittests: Added unit tests for podman-compose secrets
2024-07-02 20:52:34 +03:00
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
d9a3572461
Merge pull request #978 from PlugNPush/main
...
Restore support for alt dockerfiles (removing hardcoded "Dockerfile")
2024-06-26 21:39:42 +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
0bcf0799b6
Merge pull request #976 from p12tic/tests-move-around
...
Move all tests to single directory "tests"
2024-06-26 11:30:21 +03:00
18472b53ac
Move all tests to single directory "tests"
...
Signed-off-by: Povilas Kanapickas <povilas@radix.lt >
2024-06-26 11:28:16 +03:00
d38b26bb01
Release 1.2.0
...
Signed-off-by: Povilas Kanapickas <povilas@radix.lt >
v1.2.0
2024-06-26 10:43:28 +03:00
22a4ad5806
Merge pull request #975 from p12tic/changelog
...
Add release notes for v1.2.0
2024-06-26 10:41:59 +03:00
37e2cb28d4
Add release notes for v1.2.0
...
Signed-off-by: Povilas Kanapickas <povilas@radix.lt >
2024-06-26 10:39:48 +03:00
0cd3902c5f
Merge pull request #974 from p12tic/newsfragments
...
Use newsfragments pattern for the release notes
2024-06-26 10:37:54 +03:00
6ef759c6fd
Use newsfragments pattern for the release notes
...
Signed-off-by: Povilas Kanapickas <povilas@radix.lt >
2024-06-26 10:21:03 +03:00
16cbcf4152
Merge pull request #956 from Genzer/fix/loading-.env-breaking-since-1.1.0
...
Load .env from Compose file's directory and cwd
2024-06-24 23:37:33 +03:00
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