diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-22 08:46:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-22 08:46:55 +0000 |
| commit | 7cb4f7d01c5e61ebd5f324822e41910564d5563f (patch) | |
| tree | 0991b7f2611dee2380df9cbe203df436f07c4be2 /docker/solum | |
| parent | 8650c57c12498c483445536af5b5a85ada87791e (diff) | |
| parent | e21aeb5ae955671937055baf57836120af8d4312 (diff) | |
| download | kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip | |
Merge "flatten images a bit"
Diffstat (limited to 'docker/solum')
| -rw-r--r-- | docker/solum/solum-base/Dockerfile.j2 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/solum/solum-base/Dockerfile.j2 b/docker/solum/solum-base/Dockerfile.j2 index 11e55d9a9..8bad55fe3 100644 --- a/docker/solum/solum-base/Dockerfile.j2 +++ b/docker/solum/solum-base/Dockerfile.j2 @@ -15,15 +15,14 @@ ADD solum-base-archive /solum-base-source '/solum' ] %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start + RUN ln -s solum-base-source/* solum \ && {{ macros.install_pip(solum_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/solum \ && cp -r /solum/etc/solum/* /etc/solum/ \ - && chown -R solum: /etc/solum - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN touch /usr/local/bin/kolla_solum_extend_start \ + && chown -R solum: /etc/solum \ + && touch /usr/local/bin/kolla_solum_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_solum_extend_start {% block solum_base_footer %}{% endblock %} |