diff --git a/OracleLinuxDevelopers/oraclelinux7/nodejs/10-oracledb/Dockerfile b/OracleLinuxDevelopers/oraclelinux7/nodejs/10-oracledb/Dockerfile deleted file mode 100644 index d80ac3f98d..0000000000 --- a/OracleLinuxDevelopers/oraclelinux7/nodejs/10-oracledb/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -# 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 - -RUN yum -y install oracle-nodejs-release-el7 oracle-release-el7 && \ - 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/* - -ENV NODE_PATH=/usr/lib/node_modules - -CMD ["/bin/node", "-v"] diff --git a/OracleLinuxDevelopers/oraclelinux7/nodejs/12-oracledb/Dockerfile b/OracleLinuxDevelopers/oraclelinux7/nodejs/12-oracledb/Dockerfile index ec35a47e5f..b6e4661352 100644 --- a/OracleLinuxDevelopers/oraclelinux7/nodejs/12-oracledb/Dockerfile +++ b/OracleLinuxDevelopers/oraclelinux7/nodejs/12-oracledb/Dockerfile @@ -1,9 +1,9 @@ -# Copyright (c) 2020, 2021 Oracle and/or its affiliates. +# Copyright (c) 2020, 2022 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 RUN yum -y install oracle-nodejs-release-el7 oracle-instantclient-release-el7 && \ - yum-config-manager --disable ol7_developer_nodejs14 && \ + yum-config-manager --disable ol7_developer_nodejs\* && \ yum-config-manager --enable ol7_developer_nodejs12 && \ yum -y install nodejs node-oracledb-node12 && \ rm -rf /var/cache/yum/* diff --git a/OracleLinuxDevelopers/oraclelinux7/nodejs/12/Dockerfile b/OracleLinuxDevelopers/oraclelinux7/nodejs/12/Dockerfile index 9867ef5a8d..156e0438c2 100644 --- a/OracleLinuxDevelopers/oraclelinux7/nodejs/12/Dockerfile +++ b/OracleLinuxDevelopers/oraclelinux7/nodejs/12/Dockerfile @@ -1,9 +1,9 @@ -# Copyright (c) 2020 Oracle and/or its affiliates. +# Copyright (c) 2020, 2022 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 RUN yum -y install oracle-nodejs-release-el7 && \ - yum-config-manager --disable ol7_developer_nodejs14 && \ + yum-config-manager --disable ol7_developer_nodejs\* && \ yum-config-manager --enable ol7_developer_nodejs12 && \ yum -y install nodejs && \ rm -rf /var/cache/yum/* diff --git a/OracleLinuxDevelopers/oraclelinux7/nodejs/14-oracledb/Dockerfile b/OracleLinuxDevelopers/oraclelinux7/nodejs/14-oracledb/Dockerfile index 62e7800ecb..317fb55a57 100644 --- a/OracleLinuxDevelopers/oraclelinux7/nodejs/14-oracledb/Dockerfile +++ b/OracleLinuxDevelopers/oraclelinux7/nodejs/14-oracledb/Dockerfile @@ -1,8 +1,10 @@ -# Copyright (c) 2020 Oracle and/or its affiliates. +# Copyright (c) 2020, 2022 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 RUN yum -y install oracle-nodejs-release-el7 oracle-instantclient-release-el7 && \ + yum-config-manager --disable ol7_developer_nodejs\* && \ + yum-config-manager --enable ol7_developer_nodejs14 && \ yum -y install nodejs node-oracledb-node14 && \ rm -rf /var/cache/yum/* diff --git a/OracleLinuxDevelopers/oraclelinux7/nodejs/14/Dockerfile b/OracleLinuxDevelopers/oraclelinux7/nodejs/14/Dockerfile index abe4183b81..90a78fa192 100644 --- a/OracleLinuxDevelopers/oraclelinux7/nodejs/14/Dockerfile +++ b/OracleLinuxDevelopers/oraclelinux7/nodejs/14/Dockerfile @@ -1,8 +1,10 @@ -# Copyright (c) 2020 Oracle and/or its affiliates. +# Copyright (c) 2020, 2022 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 RUN yum -y install oracle-nodejs-release-el7 && \ + yum-config-manager --disable ol7_developer_nodejs\* && \ + yum-config-manager --enable ol7_developer_nodejs14 && \ yum -y install nodejs && \ rm -rf /var/cache/yum/* diff --git a/OracleLinuxDevelopers/oraclelinux7/nodejs/16-oracledb/Dockerfile b/OracleLinuxDevelopers/oraclelinux7/nodejs/16-oracledb/Dockerfile new file mode 100644 index 0000000000..a5ec8863bd --- /dev/null +++ b/OracleLinuxDevelopers/oraclelinux7/nodejs/16-oracledb/Dockerfile @@ -0,0 +1,13 @@ +# Copyright (c) 2022 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 + +RUN yum -y install oracle-nodejs-release-el7 oracle-instantclient-release-el7 && \ + yum-config-manager --disable ol7_developer_nodejs\* && \ + yum-config-manager --enable ol7_developer_nodejs16 && \ + yum -y install nodejs node-oracledb-node16 && \ + rm -rf /var/cache/yum/* + +ENV NODE_PATH=/usr/lib/node_modules/ + +CMD ["/bin/node", "-v"] diff --git a/OracleLinuxDevelopers/oraclelinux7/nodejs/10/Dockerfile b/OracleLinuxDevelopers/oraclelinux7/nodejs/16/Dockerfile similarity index 60% rename from OracleLinuxDevelopers/oraclelinux7/nodejs/10/Dockerfile rename to OracleLinuxDevelopers/oraclelinux7/nodejs/16/Dockerfile index 68aeac1854..41f1d19f66 100644 --- a/OracleLinuxDevelopers/oraclelinux7/nodejs/10/Dockerfile +++ b/OracleLinuxDevelopers/oraclelinux7/nodejs/16/Dockerfile @@ -1,10 +1,10 @@ -# Copyright (c) 2020 Oracle and/or its affiliates. +# Copyright (c) 2022 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 RUN yum -y install oracle-nodejs-release-el7 && \ - yum-config-manager --disable ol7_developer_nodejs14 && \ - yum-config-manager --enable ol7_developer_nodejs10 && \ + yum-config-manager --disable ol7_developer_nodejs\* && \ + yum-config-manager --enable ol7_developer_nodejs16 && \ yum -y install nodejs && \ rm -rf /var/cache/yum/*