diff options
| author | Zuul <zuul@review.opendev.org> | 2021-04-28 18:26:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-04-28 18:26:01 +0000 |
| commit | 57341325e030ee2742409945b88120c3d3924a84 (patch) | |
| tree | f5dccaf4c64156a188c7a7ba34f59b0f7f246d74 /docker | |
| parent | 8926bc3dfa63a597861407e6f6c1dbafeae46a71 (diff) | |
| parent | b54789d093d8f9e35265d313e95f9f89aceb4f4b (diff) | |
| download | kolla-57341325e030ee2742409945b88120c3d3924a84.tar.gz kolla-57341325e030ee2742409945b88120c3d3924a84.zip | |
Merge "Pin erlang"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 4 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 9792854d5..c8e36affd 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -1,3 +1,7 @@ Package: rabbitmq-server Pin: version 3.8.* Pin-Priority: 1000 + +Package: erlang* +Pin: version 1:23.* +Pin-Priority: 1000 diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 4165693cd..7b018880d 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -19,6 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set kolla_toolbox_packages = [ 'crudini', + 'erlang-23.*', 'gcc', 'gdisk', 'git', diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 717b07498..e30de3734 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -15,6 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set rabbitmq_packages = [ 'hostname', + 'erlang-23.*', 'rabbitmq-server-3.8.*' ] %} |