diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-11 18:35:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-11 18:35:33 +0000 |
| commit | d4379a5cde5dba86bf48c4a12aaed2e16475c29b (patch) | |
| tree | c8ecda1759f8d8166ceee05728c0e01b1aa7779f | |
| parent | e21c39b0980ec5f4d79f03be8d878e85126d1ea3 (diff) | |
| parent | c691334181405b0fe22e0624de8fb823720259d8 (diff) | |
| download | kolla-d4379a5cde5dba86bf48c4a12aaed2e16475c29b.tar.gz kolla-d4379a5cde5dba86bf48c4a12aaed2e16475c29b.zip | |
Merge "Drop root for designate"
| -rw-r--r-- | docker/designate/designate-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/designate/designate-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/designate/designate-backend-bind9/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/designate/designate-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/designate/designate-central/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/designate/designate-mdns/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/designate/designate-poolmanager/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/designate/designate-sink/Dockerfile.j2 | 2 |
8 files changed, 15 insertions, 1 deletions
diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2 index 268a93fed..4bb3b8319 100644 --- a/docker/designate/designate-api/Dockerfile.j2 +++ b/docker/designate/designate-api/Dockerfile.j2 @@ -14,4 +14,6 @@ RUN yum install -y \ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start +USER designate + {{ include_footer }} diff --git a/docker/designate/designate-api/extend_start.sh b/docker/designate/designate-api/extend_start.sh index f851d894a..10056778b 100644 --- a/docker/designate/designate-api/extend_start.sh +++ b/docker/designate/designate-api/extend_start.sh @@ -3,6 +3,6 @@ # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - sudo -H -u designate designate-manage db_sync + designate-manage db_sync exit 0 fi diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index 8f9a9aec3..b7c734442 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/docker/designate/designate-backend-bind9/Dockerfile.j2 @@ -12,4 +12,6 @@ RUN yum install -y bind \ {% endif %} {% endif %} +USER designate + {{ include_footer }} diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index fe9657d6f..834eec84b 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -29,3 +29,5 @@ RUN ln -s designate-base-source/* designate \ && chown -R designate: /etc/designate /var/log/designate /home/designate {% endif %} + +RUN usermod -a -G kolla designate diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2 index 2195441ba..8a9526dc0 100644 --- a/docker/designate/designate-central/Dockerfile.j2 +++ b/docker/designate/designate-central/Dockerfile.j2 @@ -10,4 +10,6 @@ RUN yum install -y openstack-designate-central \ {% endif %} {% endif %} +USER designate + {{ include_footer }} diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2 index 97f9a2ffc..be9341e12 100644 --- a/docker/designate/designate-mdns/Dockerfile.j2 +++ b/docker/designate/designate-mdns/Dockerfile.j2 @@ -10,4 +10,6 @@ RUN yum install -y openstack-designate-mdns \ {% endif %} {% endif %} +USER designate + {{ include_footer }} diff --git a/docker/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2 index 35d847211..25fc8f7e4 100644 --- a/docker/designate/designate-poolmanager/Dockerfile.j2 +++ b/docker/designate/designate-poolmanager/Dockerfile.j2 @@ -13,4 +13,6 @@ RUN yum install -y \ {% endif %} {% endif %} +USER designate + {{ include_footer }} diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2 index 8b863bfbf..1d059ea6f 100644 --- a/docker/designate/designate-sink/Dockerfile.j2 +++ b/docker/designate/designate-sink/Dockerfile.j2 @@ -12,4 +12,6 @@ RUN yum install -y \ {% endif %} {% endif %} +USER designate + {{ include_footer }} |