mirror of
https://github.com/containers/podman.git
synced 2025-06-27 21:50:18 +08:00
compat API: network inspect do not show isolate option
We force the isolate option on new newtworks because that is the docker behavior. However when we inspect them they should not be displayed to the caller since they have no idea about it and docker-compose throws an error because of that. Fixes #15580 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
@ -2,4 +2,5 @@ version: '3'
|
||||
services:
|
||||
app:
|
||||
build: .
|
||||
command: sleep 10002
|
||||
command: sleep 10001
|
||||
stop_signal: SIGKILL # faster shutdown, no reason to wait 10 seconds
|
||||
|
3
test/compose/uptwice/teardown.sh
Normal file
3
test/compose/uptwice/teardown.sh
Normal file
@ -0,0 +1,3 @@
|
||||
# -*- bash -*-
|
||||
|
||||
mv docker-compose.yml.bak docker-compose.yml
|
@ -1,4 +1,17 @@
|
||||
# -*- bash -*-
|
||||
|
||||
CR=$'\r'
|
||||
NL=$'\n'
|
||||
|
||||
cp docker-compose.yml docker-compose.yml.bak
|
||||
sed -i -e 's/10001/10002/' docker-compose.yml
|
||||
docker-compose up -d
|
||||
output=$(docker-compose up -d 2>&1)
|
||||
|
||||
# Horrible output check here but we really want to make sure that there are
|
||||
# no unexpected warning/errors and the normal messages are send on stderr as
|
||||
# well so we cannot check for an empty stderr.
|
||||
expected="Recreating uptwice_app_1 ... ${CR}${NL}Recreating uptwice_app_1 ... done$CR"
|
||||
if [ "$TEST_FLAVOR" = "compose_v2" ]; then
|
||||
expected="Container uptwice-app-1 Recreate${NL}Container uptwice-app-1 Recreated${NL}Container uptwice-app-1 Starting${NL}Container uptwice-app-1 Started"
|
||||
fi
|
||||
is "$output" "$expected" "no error output in compose up (#15580)"
|
||||
|
Reference in New Issue
Block a user