add rhscl beta repositories for v14

sclorg · Oct 29, 2020 · c6f0dd3 · c6f0dd3
1 parent 28f56c8
commit c6f0dd3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/14/.exclude-rhel7 b/14/.exclude-rhel7
diff --git a/14/Dockerfile b/14/Dockerfile
@@ -53,7 +53,7 @@ LABEL summary="$SUMMARY" \
       usage="s2i build <SOURCE-REPOSITORY> centos/$NAME-$NODEJS_VERSION-centos7:latest <APP-NAME>"
 
 RUN yum install -y centos-release-scl-rh && \
-    MODULE_DEPS="make gcc gcc-c++ libatomic_ops" && \
+    MODULE_DEPS="make gcc gcc-c++" && \
     INSTALL_PKGS="$MODULE_DEPS rh-nodejs${NODEJS_VERSION} rh-nodejs${NODEJS_VERSION}-npm rh-nodejs${NODEJS_VERSION}-nodejs-nodemon nss_wrapper" && \
     ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
     yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \

diff --git a/14/Dockerfile.rhel7 b/14/Dockerfile.rhel7
@@ -57,7 +57,9 @@ LABEL summary="$SUMMARY" \
 
 RUN yum install -y yum-utils && \
     prepare-yum-repositories rhel-server-rhscl-7-rpms && \
-    MODULE_DEPS="make gcc gcc-c++ libatomic_ops" && \
+    yum-config-manager --add-repo http://download-node-02.eng.bos.redhat.com/rhel-7/rel-eng/RHSCL-3.6-RHEL-7-Beta-1.0/compose/Server/x86_64/os/ && \
+    echo gpgcheck=0 >> /etc/yum.repos.d/download-node-02.eng.bos.redhat.com_rhel-7_rel-eng_RHSCL-3.6-RHEL-7-Beta-1.0_compose_Server_x86_64_os_.repo && \
+    MODULE_DEPS="make gcc gcc-c++" && \
     INSTALL_PKGS="$MODULE_DEPS rh-nodejs${NODEJS_VERSION} rh-nodejs${NODEJS_VERSION}-npm rh-nodejs${NODEJS_VERSION}-nodejs-nodemon nss_wrapper" && \
     ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
     yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \