From 897337cdd61f1702aa7e68da0466804bf0d21a86 Mon Sep 17 00:00:00 2001 From: Paul Bourke Date: Wed, 17 Jun 2015 11:14:59 +0000 Subject: Symlink all non Dockerfile resources in images The only files in the docker image directories that differ majorly between distros are the Dockerfiles (e.g. different package manager mechanisms, different repo sources, etc). The supporting files such as the start.sh/check.sh and config files should largely stay the same between base images. This change moves these files up into a "common" directory, and symlinks them in the same way that the build script is managed. This means when adding a new base distro only new Dockerfiles need to be created. Also, if a distro does happen to require a vastly different start.sh script for example, one can choose to simply not symlink to the common and instead drop in a custom one. Implements: blueprint refactor-base-image-layout Change-Id: Ic4db69d31ff54a1fb95af4853a2e5ae490064284 --- docker/fedora/binary/base/kolla-common.sh | 2 +- docker/fedora/binary/base/service_hosts.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/fedora/binary') diff --git a/docker/fedora/binary/base/kolla-common.sh b/docker/fedora/binary/base/kolla-common.sh index 380efbc3d..c265c62f7 120000 --- a/docker/fedora/binary/base/kolla-common.sh +++ b/docker/fedora/binary/base/kolla-common.sh @@ -1 +1 @@ -../../../common/kolla-common.sh \ No newline at end of file +../../../common/base/kolla-common.sh \ No newline at end of file diff --git a/docker/fedora/binary/base/service_hosts.sh b/docker/fedora/binary/base/service_hosts.sh index 777b7334d..06e045440 120000 --- a/docker/fedora/binary/base/service_hosts.sh +++ b/docker/fedora/binary/base/service_hosts.sh @@ -1 +1 @@ -../../../common/service_hosts.sh \ No newline at end of file +../../../common/base/service_hosts.sh \ No newline at end of file -- cgit v1.2.3