diff options
| author | Zuul <zuul@review.openstack.org> | 2018-04-18 07:15:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-04-18 07:15:12 +0000 |
| commit | dba0aee4d91e472c958e07f01a86b09ae6b0c45c (patch) | |
| tree | 0a38e2c42b81d76680d772c5fb7ec8fbbb397d23 | |
| parent | 0f9953fac0f82f1e56226a0d5657dac118cae1a9 (diff) | |
| parent | 38f18f2d1280d7429a7be45b993bb5f166f39134 (diff) | |
| download | kolla-dba0aee4d91e472c958e07f01a86b09ae6b0c45c.tar.gz kolla-dba0aee4d91e472c958e07f01a86b09ae6b0c45c.zip | |
Merge "Update base image with latest security fixes"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | releasenotes/notes/update_rpm_security_fixes-f99a3fa509cb5b3b.yaml | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 4d6006c20..c48705dbc 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -145,7 +145,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 rpm --import {{ key }} \ {% endfor -%} {%- if base_centos_yum_repo_keys|customizable('centos_yum_repo_keys')|length == 0 %}RUN {% else %} && {% endif -%} - yum clean all + yum -y update --security --sec-severity=Important --sec-severity=Critical \ + && yum clean all {% endif %} {# Endif for base_distro centos #} @@ -161,11 +162,12 @@ RUN yum -y install \ && yum-config-manager --enable rhel-7-server-optional-rpms \ && yum -y install \ yum-plugin-priorities \ - && yum clean all \ && yum-config-manager --enable rhel-7-server-extras-rpms \ && yum-config-manager --enable rhel-7-server-rhceph-2-osd-rpms \ && yum-config-manager --enable rhel-7-server-rhceph-2-mon-rpms \ - && yum-config-manager --enable rhel-7-server-rhceph-2-tools-rpms + && yum-config-manager --enable rhel-7-server-rhceph-2-tools-rpms \ + && yum -y update --security --sec-severity=Important --sec-severity=Critical \ + && yum clean all {% endblock %} {% endif %} @@ -193,6 +195,7 @@ RUN yum -y install \ && yum-config-manager --enable ol7_optional_latest ol7_addons \ && yum -y install \ yum-plugin-priorities \ + && yum -y update --security --sec-severity=Important --sec-severity=Critical \ && yum clean all {% endblock %} diff --git a/releasenotes/notes/update_rpm_security_fixes-f99a3fa509cb5b3b.yaml b/releasenotes/notes/update_rpm_security_fixes-f99a3fa509cb5b3b.yaml new file mode 100644 index 000000000..8c1cb6599 --- /dev/null +++ b/releasenotes/notes/update_rpm_security_fixes-f99a3fa509cb5b3b.yaml @@ -0,0 +1,4 @@ +--- +features: + - RPM based container images now include the latest security fixes available + at the time of build. |