diff options
| author | Zuul <zuul@review.opendev.org> | 2022-08-31 13:40:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-08-31 13:40:21 +0000 |
| commit | a1021d65992dc338933da1df5d9572db76578725 (patch) | |
| tree | 6cc35168b926df5086676e3f64ab4ced14561c3b | |
| parent | 904f346d976c1a9e69e9cb6809b7d972bad33a1e (diff) | |
| parent | 1d324d7d7a5776ba95f03a03142cff5772ca1a3e (diff) | |
| download | kolla-a1021d65992dc338933da1df5d9572db76578725.tar.gz kolla-a1021d65992dc338933da1df5d9572db76578725.zip | |
Merge "Revert "Workaround setuptools==60.0.0 breakages""
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index a99462120..04a37f9f4 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -35,9 +35,6 @@ ENV KOLLA_BASE_DISTRO={{ base_distro }} \ KOLLA_DISTRO_PYTHON_VERSION={{ distro_python_version }} \ KOLLA_BASE_ARCH={{ base_arch }} -{# NOTE(frickler): sledgehammer workaround until pkgs are updated to build with setuptools==60.0.0 properly #} -ENV SETUPTOOLS_USE_DISTUTILS=stdlib - #### Customize PS1 to be used with bash shell COPY kolla_bashrc /tmp/ |