From 7930dc048d8b7fd9bc2ab904f9230ef8e1e4e984 Mon Sep 17 00:00:00 2001 From: Vishnu Bharathi Date: Thu, 31 Mar 2022 16:16:27 +0530 Subject: [PATCH] ci: patch base images for security updates PR-URL: https://github.com/hasura/graphql-engine-mono/pull/4121 GitOrigin-RevId: e021c22d0647440b5afefa65dbbedf6e201cd17f --- packaging/graphql-engine-base/centos.dockerfile | 9 ++------- packaging/graphql-engine-base/ubuntu.dockerfile | 2 ++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packaging/graphql-engine-base/centos.dockerfile b/packaging/graphql-engine-base/centos.dockerfile index 2463938b4c3..8aaee021825 100644 --- a/packaging/graphql-engine-base/centos.dockerfile +++ b/packaging/graphql-engine-base/centos.dockerfile @@ -1,4 +1,4 @@ -# DATE VERSION: 2022-03-29 +# DATE VERSION: 2022-03-31 # Modify the above date version (YYYY-MM-DD) if you want to rebuild the image for security updates FROM quay.io/centos/centos@sha256:fc45f3e1294861d7851a87be152b1ab2350d755744077d5ee12b725fdca87919 @@ -27,12 +27,7 @@ RUN yum update -y --nobest \ ;; \ "linux/arm64") \ dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-aarch64/pgdg-redhat-repo-latest.noarch.rpm \ - # TODO: remove --nogpgcheck after resolving https://www.postgresql.org/message-id/flat/CAA77xwWaf_ZhaTe6qS0O5vrJjx5pJs07GYipn7ZCbMrXfeVqTA%40mail.gmail.com - && dnf install -y --nogpgcheck postgresql13-devel \ - # TODO: remove following command after removing --nogpgcheck above - # The following file seem to cause installation issue with packages in the next steps - # Hence this file is removed here - && rm -rf /etc/yum.repos.d/pgdg-redhat-all.repo \ + && dnf install -y postgresql13-devel \ ;; \ esac diff --git a/packaging/graphql-engine-base/ubuntu.dockerfile b/packaging/graphql-engine-base/ubuntu.dockerfile index 958e72798df..b416f6cb3a5 100644 --- a/packaging/graphql-engine-base/ubuntu.dockerfile +++ b/packaging/graphql-engine-base/ubuntu.dockerfile @@ -1,3 +1,5 @@ +# DATE VERSION: 2022-03-31 +# Modify the above date version (YYYY-MM-DD) if you want to rebuild the image for security updates FROM ubuntu:20.04 # TARGETPLATFORM is automatically set up by docker buildx based on the platform we are targetting for