]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
tests: docker images must use install-deps.sh
authorLoic Dachary <ldachary@redhat.com>
Sat, 20 Dec 2014 17:20:58 +0000 (18:20 +0100)
committerLoic Dachary <ldachary@redhat.com>
Sun, 21 Dec 2014 16:52:18 +0000 (17:52 +0100)
commitd8f84d15dbbec35e4b8aa4e81f29bf6011f946e1
treee7456e87a943fb9310f0a960686798d69bd5e1ba
parent80f20f8ed3e338b34e44fc0b554849d62a1444a0
tests: docker images must use install-deps.sh

The dockerfiles must run install-deps.sh instead of duplicating the
package list that is found in ceph.spec.in and debian/control.

A directory is created for each os_type and provided as a context for
docker build to use. The former $os_type.dockerfile is moved into
$os_type/Dockerfile.in (the .in as a reminder that it will be variable
substituted).

http://tracker.ceph.com/issues/10401 Fixes: #10401

Signed-off-by: Loic Dachary <ldachary@redhat.com>
src/test/Makefile.am
src/test/centos.dockerfile [deleted file]
src/test/centos/Dockerfile.in [new file with mode: 0644]
src/test/centos/ceph.spec.in [new symlink]
src/test/centos/install-deps.sh [new symlink]
src/test/docker-test-helper.sh
src/test/ubuntu.dockerfile [deleted file]
src/test/ubuntu/Dockerfile.in [new file with mode: 0644]
src/test/ubuntu/debian [new symlink]
src/test/ubuntu/install-deps.sh [new symlink]