Skip to content

Commit

Permalink
Add which command that is required by some npm modules when compinging
Browse files Browse the repository at this point in the history
Seen during installing of rdkafka npm module, the build failed on missing which command
  • Loading branch information
hhorak committed Aug 17, 2023
1 parent 90ee3a9 commit 8bcfd39
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion 16/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ LABEL summary="$SUMMARY" \

RUN yum install -y centos-release-scl-rh && \
MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \
INSTALL_PKGS="$MODULE_DEPS rh-nodejs${NODEJS_VERSION} rh-nodejs${NODEJS_VERSION}-npm rh-nodejs${NODEJS_VERSION}-nodejs-nodemon nss_wrapper" && \
INSTALL_PKGS="$MODULE_DEPS rh-nodejs${NODEJS_VERSION} rh-nodejs${NODEJS_VERSION}-npm rh-nodejs${NODEJS_VERSION}-nodejs-nodemon nss_wrapper which" && \
ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion 16/Dockerfile.rhel7
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ LABEL summary="$SUMMARY" \
RUN yum install -y yum-utils && \
prepare-yum-repositories rhel-server-rhscl-7-rpms && \
MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \
INSTALL_PKGS="$MODULE_DEPS rh-nodejs${NODEJS_VERSION} rh-nodejs${NODEJS_VERSION}-npm rh-nodejs${NODEJS_VERSION}-nodejs-nodemon nss_wrapper" && \
INSTALL_PKGS="$MODULE_DEPS rh-nodejs${NODEJS_VERSION} rh-nodejs${NODEJS_VERSION}-npm rh-nodejs${NODEJS_VERSION}-nodejs-nodemon nss_wrapper which" && \
ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion 16/Dockerfile.rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ LABEL summary="$SUMMARY" \

RUN yum -y module enable nodejs:$NODEJS_VERSION && \
MODULE_DEPS="make gcc gcc-c++ libatomic_ops git openssl-devel" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \
ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
ln -s /usr/libexec/platform-python /usr/bin/python3 && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion 16/Dockerfile.rhel9
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ LABEL summary="$SUMMARY" \
usage="s2i build <SOURCE-REPOSITORY> ubi9/$NAME-$NODEJS_VERSION:latest <APP-NAME>"

RUN MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \
ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion 18/Dockerfile.c8s
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ LABEL summary="$SUMMARY" \

RUN yum -y module enable nodejs:$NODEJS_VERSION && \
MODULE_DEPS="make gcc gcc-c++ libatomic_ops git openssl-devel" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \
ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
ln -s /usr/libexec/platform-python /usr/bin/python3 && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion 18/Dockerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ LABEL summary="$SUMMARY" \
# Package libatomic_ops was removed
RUN yum -y module enable nodejs:$NODEJS_VERSION && \
MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \
ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion 18/Dockerfile.rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ LABEL summary="$SUMMARY" \

RUN yum -y module enable nodejs:$NODEJS_VERSION && \
MODULE_DEPS="make gcc gcc-c++ libatomic_ops git openssl-devel" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \
ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
ln -s /usr/libexec/platform-python /usr/bin/python3 && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion 18/Dockerfile.rhel9
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ LABEL summary="$SUMMARY" \

RUN yum -y module enable nodejs:$NODEJS_VERSION && \
MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \
ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
Expand Down
4 changes: 2 additions & 2 deletions 20/Dockerfile.c8s
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ LABEL summary="$SUMMARY" \
usage="s2i build <SOURCE-REPOSITORY> quay.io/sclorg/$NAME-$NODEJS_VERSION-c8s:latest <APP-NAME>"

RUN yum -y module enable nodejs:$NODEJS_VERSION && \
MODULE_DEPS="make gcc gcc-c++ libatomic_ops git openssl-devel" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper" && \
MODULE_DEPS="make gcc gcc-c++ libatomic_ops git openssl-devel which" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \
ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
ln -s /usr/libexec/platform-python /usr/bin/python3 && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion 20/Dockerfile.c9s
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ LABEL summary="$SUMMARY" \
# Package libatomic_ops was removed
RUN yum -y module enable nodejs:$NODEJS_VERSION && \
MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \
ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion 20/Dockerfile.rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ LABEL summary="$SUMMARY" \

RUN yum -y module enable nodejs:$NODEJS_VERSION && \
MODULE_DEPS="make gcc gcc-c++ libatomic_ops git openssl-devel" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \
ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
ln -s /usr/libexec/platform-python /usr/bin/python3 && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion 20/Dockerfile.rhel9
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ LABEL summary="$SUMMARY" \

RUN yum -y module enable nodejs:$NODEJS_VERSION && \
MODULE_DEPS="make gcc gcc-c++ git openssl-devel" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper" && \
INSTALL_PKGS="$MODULE_DEPS nodejs npm nodejs-nodemon nss_wrapper which" && \
ln -s /usr/lib/node_modules/nodemon/bin/nodemon.js /usr/bin/nodemon && \
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
Expand Down

0 comments on commit 8bcfd39

Please sign in to comment.