diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-23 15:21:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-23 15:21:21 +0000 |
| commit | dcbc4424a62d00fd61c5e5e6c47900d01b2b9864 (patch) | |
| tree | 3eaeed9fa0c8c09374fb72cda1ed54122ef4d15a | |
| parent | 0040c6d3f64b9d0a821697557204b35eee11ca0f (diff) | |
| parent | e511db7048b98bcde4f065e4cd697bb4b05a76c5 (diff) | |
| download | kolla-dcbc4424a62d00fd61c5e5e6c47900d01b2b9864.tar.gz kolla-dcbc4424a62d00fd61c5e5e6c47900d01b2b9864.zip | |
Merge "centos: we install 'hostname' in base image"
| -rw-r--r-- | docker/keepalived/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/mariadb/mariadb-server/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/docker/keepalived/Dockerfile.j2 b/docker/keepalived/Dockerfile.j2 index 18a7de835..3a3d5a08b 100644 --- a/docker/keepalived/Dockerfile.j2 +++ b/docker/keepalived/Dockerfile.j2 @@ -9,7 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set keepalived_packages = [ - 'hostname', 'keepalived' ] %} {% elif base_package_type == 'deb' %} diff --git a/docker/mariadb/mariadb-server/Dockerfile.j2 b/docker/mariadb/mariadb-server/Dockerfile.j2 index 0251bbf38..d3f6d440f 100644 --- a/docker/mariadb/mariadb-server/Dockerfile.j2 +++ b/docker/mariadb/mariadb-server/Dockerfile.j2 @@ -15,7 +15,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set mariadb_packages = [ 'expect', - 'hostname', 'mariadb-backup', 'mariadb-server', 'pv', diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 8bfa6f579..9dc7d2363 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -21,7 +21,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set rabbitmq_packages = [ 'erlang-25.*', - 'hostname', 'rabbitmq-server-3.10.*' ] %} |