Updates for nodejs 14 (#1790)

* Add missing word * Changes for addition of Node.js 14 Signed-off-by: Sergio Leunissen <sergio.leunissen@oracle.com>
oracle · Nov 23, 2020 · cca0466 · cca0466
1 parent 5e4a40e
commit cca0466
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/OracleLinuxDevelopers/oraclelinux7/nodejs/10-oracledb/Dockerfile b/OracleLinuxDevelopers/oraclelinux7/nodejs/10-oracledb/Dockerfile
@@ -10,7 +10,7 @@ LABEL "org.opencontainers.image.authors"="Oracle Linux Product Team <ol-ovm-info
       and Oracle Database connectivity enabled."
 
 RUN yum -y install oracle-nodejs-release-el7 oracle-release-el7 && \
-    yum-config-manager --disable ol7_developer_nodejs12 && \
+    yum-config-manager --disable ol7_developer_nodejs14 && \
     yum-config-manager --enable ol7_developer_nodejs10 && \
     yum -y install nodejs node-oracledb-node10 && \
     rm -rf /var/cache/yum/*

diff --git a/OracleLinuxDevelopers/oraclelinux7/nodejs/10/Dockerfile b/OracleLinuxDevelopers/oraclelinux7/nodejs/10/Dockerfile
@@ -9,7 +9,7 @@ LABEL "org.opencontainers.image.authors"="Oracle Linux Product Team <ol-ovm-info
       "org.opencontainers.image.description"="Oracle Linux 7 (slim) with Node.js 10 installed."
 
 RUN yum -y install oracle-nodejs-release-el7 && \
-    yum-config-manager --disable ol7_developer_nodejs12 && \
+    yum-config-manager --disable ol7_developer_nodejs14 && \
     yum-config-manager --enable ol7_developer_nodejs10 && \
     yum -y install nodejs && \
     rm -rf /var/cache/yum/*

diff --git a/OracleLinuxDevelopers/oraclelinux7/nodejs/12-oracledb/Dockerfile b/OracleLinuxDevelopers/oraclelinux7/nodejs/12-oracledb/Dockerfile
@@ -10,7 +10,8 @@ LABEL "org.opencontainers.image.authors"="Oracle Linux Product Team <ol-ovm-info
       and Oracle Database connectivity enabled."
 
 RUN yum -y install oracle-nodejs-release-el7 oracle-release-el7 && \
-    yum -y install nodejs node-oracledb-node12 && \
+    yum-config-manager --disable ol7_developer_nodejs14 && \
+    yum-config-manager --enable ol7_developer_nodejs12 && \
     rm -rf /var/cache/yum/*
 
 ENV NODE_PATH=/usr/lib/node_modules

diff --git a/OracleLinuxDevelopers/oraclelinux7/nodejs/12/Dockerfile b/OracleLinuxDevelopers/oraclelinux7/nodejs/12/Dockerfile
@@ -9,6 +9,8 @@ LABEL "org.opencontainers.image.authors"="Oracle Linux Product Team <ol-ovm-info
       "org.opencontainers.image.description"="Oracle Linux 7 (slim) with Node.js 12 installed."
 
 RUN yum -y install oracle-nodejs-release-el7 && \
+    yum-config-manager --disable ol7_developer_nodejs14 && \
+    yum-config-manager --enable ol7_developer_nodejs12 && \
     yum -y install nodejs && \
     rm -rf /var/cache/yum/*
 

diff --git a/OracleLinuxDevelopers/oraclelinux7/nodejs/14/Dockerfile b/OracleLinuxDevelopers/oraclelinux7/nodejs/14/Dockerfile
@@ -0,0 +1,15 @@
+# Copyright (c) 2020 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+FROM oraclelinux:7-slim
+
+LABEL "org.opencontainers.image.authors"="Oracle Linux Product Team <ol-ovm-info_ww@oracle.com>" \
+      "org.opencontainers.image.url"="https://github.com/oracle/docker-images" \
+      "org.opencontainers.image.source"="https://github.com/oracle/docker-images/tree/master/OracleLinuxDevelopers/oraclelinux7/nodejs/14" \
+      "org.opencontainers.image.vendor"="Oracle America, Inc" \
+      "org.opencontainers.image.description"="Oracle Linux 7 (slim) with Node.js 14 installed."
+
+RUN yum -y install oracle-nodejs-release-el7 && \
+    yum -y install nodejs && \
+    rm -rf /var/cache/yum/*
+
+CMD ["/bin/node", "-v"