diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-29 03:55:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-29 03:55:52 +0000 |
| commit | a5a5b3fd61884773a4046526be255ba24bfdc9de (patch) | |
| tree | c83e1790282e5d2acd0f3033114fdeba6e9d1268 | |
| parent | b70be6630f828394a7067bc256665a7a6fbdca54 (diff) | |
| parent | 56d24970fa81ae46052cccdaa29b8a9e4b06694b (diff) | |
| download | kolla-a5a5b3fd61884773a4046526be255ba24bfdc9de.tar.gz kolla-a5a5b3fd61884773a4046526be255ba24bfdc9de.zip | |
Merge "Create ironic-pxe container with ironic-base"
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index b550be051..72961d4b5 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }} MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} @@ -18,6 +18,7 @@ RUN apt-get install -y --no-install-recommends \ syslinux \ && apt-get clean \ && mkdir -p /tftpboot \ + && chown -R ironic: /tftpboot \ && cp /usr/lib/syslinux/pxelinux.0 /usr/lib/syslinux/chain.c32 /tftpboot {% endif %} |