Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Petr "Stone" Hracek
f4808e11ac This commit adds support for syncing upstream repository to Fedora land
Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
2020-06-03 10:31:44 +02:00
Honza Horak
96ed5fa1b5 Move nodemon install to the assemble script 2020-05-04 09:39:10 +02:00
3 changed files with 35 additions and 7 deletions

View file

@ -48,6 +48,9 @@ LABEL summary="$SUMMARY" \
help="For more information visit https://github.com/sclorg/s2i-nodejs-container" \ help="For more information visit https://github.com/sclorg/s2i-nodejs-container" \
usage="s2i build <SOURCE-REPOSITORY> centos/$NAME-$NODEJS_VERSION-centos7:latest <APP-NAME>" usage="s2i build <SOURCE-REPOSITORY> centos/$NAME-$NODEJS_VERSION-centos7:latest <APP-NAME>"
# TODO: Add nodejs-nodemon into Fedora
# https://bugzilla.redhat.com/show_bug.cgi?id=1433784
# meanwhile install it during s2i assemble step
RUN yum -y module enable nodejs:$NODEJS_VERSION && \ RUN yum -y module enable nodejs:$NODEJS_VERSION && \
INSTALL_PKGS="nodejs npm nss_wrapper" && \ INSTALL_PKGS="nodejs npm nss_wrapper" && \
yum remove $INSTALL_PKGS -y && \ yum remove $INSTALL_PKGS -y && \
@ -55,13 +58,6 @@ RUN yum -y module enable nodejs:$NODEJS_VERSION && \
rpm -V $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \
yum -y clean all --enablerepo='*' yum -y clean all --enablerepo='*'
# TODO: Add nodejs-nodemon into Fedora
# https://bugzilla.redhat.com/show_bug.cgi?id=1433784
#RUN NPM_CONFIG_PREFIX=$HOME/../ npm install -g nodemon && \
# rm $(npm config get cache)/* -rf && \
# rm -rf $(npm config get tmp)/npm-*
# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
COPY ./s2i/bin/ $STI_SCRIPTS_PATH COPY ./s2i/bin/ $STI_SCRIPTS_PATH

23
bot-cfg.yml Normal file
View file

@ -0,0 +1,23 @@
version: "1"
betka:
# is betka enabled for this repository
# optional - defaults to false
enabled: true
# optional
notifications:
email_addresses: [phracek@redhat.com, zsvetlik@redhat.com]
# Specify if master branch in upstream repository is synced
master_checker: true
# Should pull requests be synced?
# optional
pr_checker: false
# Either 'upstream_branch_name' or 'upstream_git_path' has to be specified
# Branch name which is used for sync
upstream_branch_name: master
# Path to directory with dockerfile withing upstream repository
upstream_git_path: "12"
# Github comment message to enforce sync of a pull request
# required if pr_checker is true otherwise optional
pr_comment_message: "[test]"
# optional
image_url: quay.io/rhscl/cwt-generator

View file

@ -68,6 +68,15 @@ if [ -z "$DEV_MODE" ]; then
export DEV_MODE=false export DEV_MODE=false
fi fi
# TODO: Add nodejs-nodemon into Fedora
# https://bugzilla.redhat.com/show_bug.cgi?id=1433784
# meanwhile install it during s2i assemble step
if [ "$(source /etc/os-release ; echo $NAME)" == "Fedora" ] ; then
NPM_CONFIG_PREFIX=$HOME/../ npm install -g nodemon && \
rm $(npm config get cache)/* -rf && \
rm -rf $(npm config get tmp)/npm-*
fi
# If NODE_ENV is not set by the user, then NODE_ENV is determined by whether # If NODE_ENV is not set by the user, then NODE_ENV is determined by whether
# the container is run in development mode. # the container is run in development mode.
if [ -z "$NODE_ENV" ]; then if [ -z "$NODE_ENV" ]; then