From 84ec6b9586897854c39f047b5baa2ddfac0be7f2 Mon Sep 17 00:00:00 2001 From: blag Date: Thu, 9 Jul 2020 16:15:02 -0700 Subject: [PATCH] Install Node.js 10 straight from CentOS 8 repos --- packagingenv/Dockerfile.template | 4 ++++ packagingenv/centos8/Dockerfile | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packagingenv/Dockerfile.template b/packagingenv/Dockerfile.template index a2da54a..4437bf6 100755 --- a/packagingenv/Dockerfile.template +++ b/packagingenv/Dockerfile.template @@ -4,9 +4,13 @@ FROM {{ dist }}:{{ version }} RUN yum -y install gcc-c++ make git libicu-devel rpmdevtools +{%- if version not in ('centos8') %} + # Add NodeSource repo RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash - +{%- endif %} + {%- if version in ('centos8') %} # Install development tools diff --git a/packagingenv/centos8/Dockerfile b/packagingenv/centos8/Dockerfile index b740c03..c96f6c5 100644 --- a/packagingenv/centos8/Dockerfile +++ b/packagingenv/centos8/Dockerfile @@ -2,9 +2,6 @@ FROM centos:8 RUN yum -y install gcc-c++ make git libicu-devel rpmdevtools -# Add NodeSource repo -RUN curl --silent --location https://rpm.nodesource.com/setup_10.x | bash - - # Install development tools RUN yum -y module install nodejs:10