diff options
| author | Zuul <zuul@review.opendev.org> | 2024-09-03 08:22:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-09-03 08:22:18 +0000 |
| commit | c63961fdbe4b00707dfc744c57b5b7b0a3257a64 (patch) | |
| tree | c8466f3ac91073bf66b40108b3bd9fa9df36a240 /docker/openstack-base | |
| parent | 1fb183ad988a48665501e34001146636241addb3 (diff) | |
| parent | 978a2864f923fa2e65afa13808571ea7738729e6 (diff) | |
| download | kolla-c63961fdbe4b00707dfc744c57b5b7b0a3257a64.tar.gz kolla-c63961fdbe4b00707dfc744c57b5b7b0a3257a64.zip | |
Merge "Fix symlinking of openstack-base source"
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index df03aaced..1df4321e5 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -135,7 +135,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'pika', 'prettytable', 'psutil', - '/pycadf', + '/plugins/pycadf*', 'pyinotify', 'pymysql', 'pyngus', @@ -182,13 +182,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build %} ADD openstack-base-archive /openstack-base-source -ADD plugins-archive /openstack-base-source +ADD plugins-archive / -RUN ln -s openstack-base-source/plugins/* /pycadf \ - && mkdir -p /etc/pycadf \ - && cp /pycadf/etc/pycadf/* /etc/pycadf/ +RUN mkdir -p /etc/pycadf \ + && cp /plugins/pycadf*/etc/pycadf/* /etc/pycadf/ -RUN ln -s openstack-base-source/*requirements* /requirements \ +RUN ln -s openstack-base-source/* /requirements \ {# NOTE(mnasiadka): Remove ovs from upper-constraints.txt because python3-openvswitch is usually newer than UC entry and older version would get installed |