diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-16 11:42:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-16 11:42:28 +0000 |
| commit | f1eb7a5fd770a656feb44e1de989b2c4da0541a3 (patch) | |
| tree | b3c70babdb55fb737f3a6c4d547afb5c60f58e64 /docker/base/Dockerfile.j2 | |
| parent | 2ee796bdce78aadaeaf42796a4f4dce9e7471ce0 (diff) | |
| parent | 8484190e77e4237247dac7fba128e5a111fc9918 (diff) | |
| download | kolla-f1eb7a5fd770a656feb44e1de989b2c4da0541a3.tar.gz kolla-f1eb7a5fd770a656feb44e1de989b2c4da0541a3.zip | |
Merge "Refactor Apache httpd setup"
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index e75e44179..a1e000681 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -441,9 +441,9 @@ COPY set_configs.py /usr/local/bin/kolla_set_configs {% if distro_python_version.startswith('3') %} RUN sed -i -e "s+#\!/usr/bin/env python+#\!/usr/bin/env python3+g" /usr/local/bin/kolla_set_configs {% endif %} - COPY start.sh /usr/local/bin/kolla_start COPY copy_cacerts.sh /usr/local/bin/kolla_copy_cacerts +COPY httpd_setup.sh /usr/local/bin/kolla_httpd_setup COPY sudoers /etc/sudoers COPY curlrc /root/.curlrc @@ -470,7 +470,7 @@ RUN chmod 755 /usr/local/bin/healthcheck_* {% endif %} RUN touch /usr/local/bin/kolla_extend_start \ - && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_set_configs /usr/local/bin/kolla_copy_cacerts \ + && chmod 755 /usr/local/bin/kolla_start /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_set_configs /usr/local/bin/kolla_copy_cacerts /usr/local/bin/kolla_httpd_setup \ && chmod 440 /etc/sudoers \ && mkdir -p /var/log/kolla \ && chown :kolla /var/log/kolla \ |