diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-24 12:17:58 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-02-24 12:17:58 +0100 |
| commit | faf65e73b778867d36f0e13dd1b0f1a4ef1f4723 (patch) | |
| tree | c293e21e762f6585d5da07410e92cefa08a3df7c /apps/files_external/tests/env/start-swift-ceph.sh | |
| parent | 0cd097e771480673ed681b657f45317d48724cf1 (diff) | |
| parent | 1d8c1f5692a2a3d2328bb7ad2e5b81fc4ce07153 (diff) | |
| download | nextcloud-server-faf65e73b778867d36f0e13dd1b0f1a4ef1f4723.tar.gz nextcloud-server-faf65e73b778867d36f0e13dd1b0f1a4ef1f4723.zip | |
Merge pull request #22593 from owncloud/swift-docker-fix
Enable upstream entrypoint changes with Ceph Docker
Diffstat (limited to 'apps/files_external/tests/env/start-swift-ceph.sh')
| -rwxr-xr-x | apps/files_external/tests/env/start-swift-ceph.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/files_external/tests/env/start-swift-ceph.sh b/apps/files_external/tests/env/start-swift-ceph.sh index f3707aa39f6..123f6b6871e 100755 --- a/apps/files_external/tests/env/start-swift-ceph.sh +++ b/apps/files_external/tests/env/start-swift-ceph.sh @@ -38,7 +38,6 @@ pass=testing tenant=testenant region=testregion service=testceph -endpointFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" container=`docker run -d \ -e KEYSTONE_PUBLIC_PORT=${port} \ @@ -48,9 +47,8 @@ container=`docker run -d \ -e KEYSTONE_ENDPOINT_REGION=${region} \ -e KEYSTONE_SERVICE=${service} \ -e OSD_SIZE=300 \ - -v ${endpointFolder}/entrypoint.sh:/entrypoint.sh \ --privileged \ - --entrypoint /entrypoint.sh ${docker_image}` + ${docker_image}` host=`docker inspect --format="{{.NetworkSettings.IPAddress}}" $container` |