diff options
| author |   Matei Valeanu <Matei.Valeanu@enea.com> | 2017-04-06 12:34:05 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-04-10 11:47:06 +0000 |
| commit | 9e78ba77a04219512bae5b0855b573ab03b6c1a5 (patch) | |
| tree | 8a1744ae1944f418bf557f4738a3df6f7e2956a9 /build/docker | |
| parent | 937d9d8cf17739f670dcf40528bdc59d70a3349b (diff) | |
build/install: Add USB boot option
Use isohybrid to add MBR for booting via BIOS
from USB flash drives
Also, Makefile "$(wildcard ubuntu-builder/*)" does not expand
to what is expected (does not include ubuntu-builder/Dockerfile),
as it uses a previous cached value.
Check this link for an explanation:
http://stackoverflow.com/questions/41470676/makefile-variable-expansion-with-wildcard-when-rule-creates-new-file
JIRA: FUEL-236
Change-Id: I9c6521a382917822ce930ddf76391c5f3c3a9cb7
Signed-off-by: Matei Valeanu <Matei.Valeanu@enea.com>
(cherry picked from commit eb8fbde87578e3853ffd23e403fd46bac6039cd0)
Diffstat (limited to 'build/docker')
| -rw-r--r-- | build/docker/Dockerfile | 3 | ||||
| -rw-r--r-- | build/docker/Makefile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index e41d5ec28..ce0c595d4 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -20,7 +20,8 @@ RUN apt-get install -y software-properties-common python-software-properties \ make python-setuptools python-all dpkg-dev debhelper ruby-json \ fuseiso git genisoimage bind9-host wget curl lintian tmux lxc iptables \ ca-certificates sudo apt-utils lsb-release dosfstools debmirror p7zip-full \ - build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev + build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev \ + syslinux RUN gem install fpm RUN pip install git+https://github.com/openstack/fuel-plugins diff --git a/build/docker/Makefile b/build/docker/Makefile index 783881e8d..cdf4a359c 100644 --- a/build/docker/Makefile +++ b/build/docker/Makefile @@ -74,7 +74,7 @@ deepclean: clean clean-cache # - ubuntu-builder Dockerfile (includes eventual proxy env vars), runcontext; # - The contents of this Makefile .cacheid: .dockercfg - sha1sum Makefile runcontext $(wildcard ubuntu-builder/*) > .cachedata + sha1sum Makefile runcontext ubuntu-builder/* > .cachedata cat .cachedata | $(CACHETOOL) getid > .cacheid # Clean local data related to caching - called prior to ordinary build |