From 85f2f112104d3aeea51c6c94aaebc8c0a3b1fee1 Mon Sep 17 00:00:00 2001 From: Z Date: Thu, 3 Feb 2022 08:50:35 -0600 Subject: [PATCH 1/2] Fixed ngen test image that runs model --- docker/CENTOS_NGEN_RUN.dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/CENTOS_NGEN_RUN.dockerfile b/docker/CENTOS_NGEN_RUN.dockerfile index 2fd2c30972..fa085b928e 100644 --- a/docker/CENTOS_NGEN_RUN.dockerfile +++ b/docker/CENTOS_NGEN_RUN.dockerfile @@ -1,11 +1,11 @@ -FROM centos:8.4.2105 as builder +FROM rockylinux as builder RUN yum update -y \ && yum install -y dnf-plugins-core \ - && yum -y config-manager --set-enabled powertools \ +# && yum -y config-manager --set-enabled powertools \ && yum -y install epel-release \ && yum repolist \ - && yum install -y tar git gcc-c++ gcc make cmake python38 python38-devel python38-numpy bzip2 udunits2-devel texinfo \ + && yum install -y tar git gcc-c++ gcc make cmake python38 python38-devel python38-numpy bzip2 udunits2-devel \ && dnf clean all \ && rm -rf /var/cache/yum @@ -19,7 +19,7 @@ ENV CXX=/usr/bin/g++ # Note that this may need to be temporarily used during development instead of the COPY below, to prevent any issues # cause by a local checkout being different than a fresh checkout (as is used in the Github Actions execution) -#RUN git clone https://github.com/NOAA-OWP/ngen.git +RUN git clone https://github.com/NOAA-OWP/ngen.git COPY . /ngen/ WORKDIR /ngen From 1f34e5720a72ea256699e966bea730944321a957 Mon Sep 17 00:00:00 2001 From: ZacharyWills-NOAA <60660437+ZacharyWills@users.noreply.github.com> Date: Thu, 3 Feb 2022 09:08:09 -0600 Subject: [PATCH 2/2] Update CENTOS_NGEN_RUN.dockerfile Removing redundant `git pull` that I use for local testing (see comment in file) --- docker/CENTOS_NGEN_RUN.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/CENTOS_NGEN_RUN.dockerfile b/docker/CENTOS_NGEN_RUN.dockerfile index fa085b928e..64cb9c6e46 100644 --- a/docker/CENTOS_NGEN_RUN.dockerfile +++ b/docker/CENTOS_NGEN_RUN.dockerfile @@ -19,7 +19,7 @@ ENV CXX=/usr/bin/g++ # Note that this may need to be temporarily used during development instead of the COPY below, to prevent any issues # cause by a local checkout being different than a fresh checkout (as is used in the Github Actions execution) -RUN git clone https://github.com/NOAA-OWP/ngen.git +#RUN git clone https://github.com/NOAA-OWP/ngen.git COPY . /ngen/ WORKDIR /ngen