summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-06-27 22:25:07 +0000
committerGerrit Code Review <review@openstack.org>2019-06-27 22:25:07 +0000
commit4923e714b0ec7666405b91f2b3665ef36e72ae89 (patch)
tree76aedc94160a341e1b4d6008536a78bf06af536a /docker
parentd51c0f0edb848086950c47c2356ad46b878ef95a (diff)
parentf13852289da0ba996cf03b5773facacb9ab2085b (diff)
downloadkolla-4923e714b0ec7666405b91f2b3665ef36e72ae89.tar.gz
kolla-4923e714b0ec7666405b91f2b3665ef36e72ae89.zip
Merge "Fix deployment of ceph-nfs container failing due to wrong USER" into stable/stein
Diffstat (limited to 'docker')
-rw-r--r--docker/ceph/ceph-nfs/Dockerfile.j23
1 files changed, 0 insertions, 3 deletions
diff --git a/docker/ceph/ceph-nfs/Dockerfile.j2 b/docker/ceph/ceph-nfs/Dockerfile.j2
index 9ace5de52..79d5e78ca 100644
--- a/docker/ceph/ceph-nfs/Dockerfile.j2
+++ b/docker/ceph/ceph-nfs/Dockerfile.j2
@@ -21,8 +21,5 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(ceph_nfs_packages | customizable("packages")) }}
-
{% block ceph_nfs_footer %}{% endblock %}
{% block footer %}{% endblock %}
-
-USER ceph