diff options
| -rw-r--r-- | build/docker/Dockerfile | 3 | ||||
| -rw-r--r-- | build/docker/Makefile | 2 | ||||
| -rwxr-xr-x | build/install/install.sh | 2 |
3 files changed, 5 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 diff --git a/build/install/install.sh b/build/install/install.sh index 19ff14946..c03b7decb 100755 --- a/build/install/install.sh +++ b/build/install/install.sh @@ -208,6 +208,8 @@ make_iso_image() { --joliet-long \ -x "lost+found" -o $NEWISO . + isohybrid $NEWISO + isoinfo -d -i $NEWISO } |