From ea0f7443bede8ea5f46672e02eb84fe5990951c2 Mon Sep 17 00:00:00 2001 From: Nicholas Nezis Date: Sun, 6 Mar 2022 09:05:01 -0500 Subject: [PATCH] Some Dockerfile cleanup --- docker/compile/Dockerfile.rocky8 | 4 ++-- docker/dist/Dockerfile.dist.rocky8 | 2 +- docker/test/Dockerfile.rocky8 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/compile/Dockerfile.rocky8 b/docker/compile/Dockerfile.rocky8 index a6724e91f34..e55a2f144dc 100644 --- a/docker/compile/Dockerfile.rocky8 +++ b/docker/compile/Dockerfile.rocky8 @@ -17,8 +17,8 @@ FROM rockylinux:8.5 -RUN yum -y upgrade -RUN yum -y install \ +RUN yum -y upgrade \ + && yum -y install \ ant \ automake \ curl \ diff --git a/docker/dist/Dockerfile.dist.rocky8 b/docker/dist/Dockerfile.dist.rocky8 index 3b87b635d07..a48c3c7a1a9 100644 --- a/docker/dist/Dockerfile.dist.rocky8 +++ b/docker/dist/Dockerfile.dist.rocky8 @@ -18,7 +18,7 @@ #syntax=docker/dockerfile:1.2 FROM rockylinux:8.5 -RUN yum -y install epel-release \ +RUN yum -y upgrade \ && yum -y install \ curl \ java-11-openjdk-headless \ diff --git a/docker/test/Dockerfile.rocky8 b/docker/test/Dockerfile.rocky8 index cc7386d6117..35c7135e598 100644 --- a/docker/test/Dockerfile.rocky8 +++ b/docker/test/Dockerfile.rocky8 @@ -20,8 +20,8 @@ FROM rockylinux:8.5 # This is passed to the heron build command via the --config flag ENV TARGET_PLATFORM linux -RUN yum -y upgrade -RUN yum -y install \ +RUN yum -y upgrade \ + && yum -y install \ automake \ curl \ cmake \