aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2018-02-22 18:34:10 +0100
committerMartin André <m.andre@redhat.com>2018-04-03 17:44:50 +0200
commit38f18f2d1280d7429a7be45b993bb5f166f39134 (patch)
tree422a52313366be33855e5d8587173b833b4c9cd8
parent6a3c5c58fe276e551c240b8a0dada1f4e471f819 (diff)
downloadkolla-38f18f2d1280d7429a7be45b993bb5f166f39134.tar.gz
kolla-38f18f2d1280d7429a7be45b993bb5f166f39134.zip
Update base image with latest security fixes
This ensures freshly built kolla images include the latest security fixes for severity Important and above. This was suggested by Jon Schlueter and based on the code available at https://github.com/brianwcook/happywebserver/blob/master/Dockerfile#L27 Change-Id: Ib14f326a335d9519fb888f5486950275985a788c
-rw-r--r--docker/base/Dockerfile.j29
-rw-r--r--releasenotes/notes/update_rpm_security_fixes-f99a3fa509cb5b3b.yaml4
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.