summaryrefslogtreecommitdiffstats
path: root/build/docker
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-04-06 15:49:42 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-04-06 15:49:42 +0000
commit64af432a852c0c0f6b5afc11ddde7609932704db (patch)
tree2ea0ddfe52b0f7f2cb9a99f759bfd6fd6bebd85d /build/docker
parent2e6b10e3767fd476b288415949b9d049174e00cc (diff)
parenteb8fbde87578e3853ffd23e403fd46bac6039cd0 (diff)
Merge "build/install: Add USB boot option"
Diffstat (limited to 'build/docker')
-rw-r--r--build/docker/Dockerfile3
-rw-r--r--build/docker/Makefile2
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