Skip to content

Commit

Permalink
new OL7 Dockerfiles for Node.js 16, cleanup and fixes (oracle#2219)
Browse files Browse the repository at this point in the history
  • Loading branch information
totalamateurhour authored Jan 6, 2022
1 parent c1a9ab9 commit ebf452b
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 22 deletions.
13 changes: 0 additions & 13 deletions OracleLinuxDevelopers/oraclelinux7/nodejs/10-oracledb/Dockerfile

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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/*
Expand Down
4 changes: 2 additions & 2 deletions OracleLinuxDevelopers/oraclelinux7/nodejs/12/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/*
Expand Down
Original file line number Diff line number Diff line change
@@ -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/*

Expand Down
4 changes: 3 additions & 1 deletion OracleLinuxDevelopers/oraclelinux7/nodejs/14/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/*

Expand Down
13 changes: 13 additions & 0 deletions OracleLinuxDevelopers/oraclelinux7/nodejs/16-oracledb/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
Original file line number Diff line number Diff line change
@@ -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/*

Expand Down

0 comments on commit ebf452b

Please sign in to comment.