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/freezer | |
| parent | 8650c57c12498c483445536af5b5a85ada87791e (diff) | |
| parent | e21aeb5ae955671937055baf57836120af8d4312 (diff) | |
| download | kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.tar.gz kolla-7cb4f7d01c5e61ebd5f324822e41910564d5563f.zip | |
Merge "flatten images a bit"
Diffstat (limited to 'docker/freezer')
| -rw-r--r-- | docker/freezer/freezer-api/Dockerfile.j2 | 8 | ||||
| -rw-r--r-- | docker/freezer/freezer-base/Dockerfile.j2 | 11 |
2 files changed, 9 insertions, 10 deletions
diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2 index 3e393a0de..6a862b054 100644 --- a/docker/freezer/freezer-api/Dockerfile.j2 +++ b/docker/freezer/freezer-api/Dockerfile.j2 @@ -18,12 +18,12 @@ ADD freezer-api-archive /freezer-api-source '/freezer-api' ] %} +COPY extend_start.sh /usr/local/bin/kolla_freezer_extend_start + RUN ln -s freezer-api-source/* freezer-api \ && {{ macros.install_pip(freezer_api_pip_packages | customizable("pip_packages")) }} \ - && cp -r /freezer-api/etc/freezer/* /etc/freezer/ - -COPY extend_start.sh /usr/local/bin/kolla_freezer_extend_start -RUN chmod 755 /usr/local/bin/kolla_freezer_extend_start + && cp -r /freezer-api/etc/freezer/* /etc/freezer/ \ + && chmod 755 /usr/local/bin/kolla_freezer_extend_start {% block freezer_api_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2 index 56d2dfa3a..0737eae58 100644 --- a/docker/freezer/freezer-base/Dockerfile.j2 +++ b/docker/freezer/freezer-base/Dockerfile.j2 @@ -22,16 +22,15 @@ ADD freezer-base-archive /freezer-base-source '/freezer' ] %} +COPY freezer_sudoers /etc/sudoers.d/kolla_freezer_sudoers +COPY extend_start.sh /usr/local/bin/kolla_extend_start + RUN ln -s freezer-base-source/* freezer \ && mkdir -p /etc/freezer \ && chown -R freezer: /etc/freezer \ && {{ macros.install_pip(freezer_base_pip_packages | customizable("pip_packages")) }} \ - && cp -r /freezer/etc/* /etc/freezer - -COPY freezer_sudoers /etc/sudoers.d/kolla_freezer_sudoers -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN chmod 750 /etc/sudoers.d \ + && cp -r /freezer/etc/* /etc/freezer \ + && chmod 750 /etc/sudoers.d \ && chmod 640 /etc/sudoers.d/kolla_freezer_sudoers \ && touch /usr/local/bin/kolla_freezer_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_freezer_extend_start |