Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
fix: uncomment git submodule handling.
Browse files Browse the repository at this point in the history
  • Loading branch information
iocanel committed Oct 31, 2017
1 parent 56336a0 commit 4070f59
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 4 deletions.
12 changes: 8 additions & 4 deletions bin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,18 @@ function agentimages() {
popd

pushd slave-nodejs
dockerbuild Dockerfile jenkins-slave-nodejs-centos7 jenkins-slave-base-centos7 $VERSION
dockerbuild Dockerfile jenkins-slave-nodejs-centos7 ${ARTIFACT_PREFIX}jenkins-slave-base-centos7 $VERSION
popd

pushd slave-maven
dockerbuild Dockerfile jenkins-slave-maven-centos7 jenkins-slave-base-centos7 $VERSION
dockerbuild Dockerfile jenkins-slave-maven-centos7 ${ARTIFACT_PREFIX}jenkins-slave-base-centos7 $VERSION
popd

popd

pushd images/jenkins-slave-full-centos7
dockerbuild Dockerfile jenkins-slave-full-centos7 ${ARTIFACT_PREFIX}jenkins-slave-maven-centos7 $VERSION
popd
}


Expand Down Expand Up @@ -318,8 +322,8 @@ else
MAVEN_OPTS="$MAVEN_OPTS -Dfabric8.mode=kubernetes"
fi

#git submodule init
#git submodule update
git submodule init
git submodule update

for module in $(modules_to_build)
do
Expand Down
34 changes: 34 additions & 0 deletions images/jenkins-slave-full-centos7/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
FROM openshift/jenkins-slave-maven-centos7

ENV NODEJS_VERSION=4.4 \
NPM_CONFIG_PREFIX=$HOME/.npm-global \
PATH=$HOME/node_modules/.bin/:$HOME/.npm-global/bin/:$PATH \
BASH_ENV=/usr/local/bin/scl_enable \
ENV=/usr/local/bin/scl_enable \
PROMPT_COMMAND=". /usr/local/bin/scl_enable"

COPY contrib/bin/scl_enable /usr/local/bin/scl_enable


# Install NodeJS
RUN yum install -y centos-release-scl-rh && \
INSTALL_PKGS="rh-nodejs4 rh-nodejs4-npm rh-nodejs4-nodejs-nodemon" && \
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 && \
yum clean all -y

COPY contrib/google-chrome.repo /etc/yum.repos.d/google-chrome.repo

# Install Yarn and Xvfb
RUN curl https://dl.yarnpkg.com/rpm/yarn.repo > /etc/yum.repos.d/yarn.repo && \
curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - && \
yum install -y google-chrome-stable xorg-x11-server-Xvfb liberation-mono-fonts liberation-narrow-fonts liberation-sans-fonts liberation-serif-fonts yarn nodejs gcc-c++ make && \
mkdir /.cache /.config && chmod 777 /.cache /.config && \
dbus-uuidgen > /etc/machine-id


RUN chown -R 1001:0 $HOME && \
chmod -R g+rw $HOME

USER 1001
3 changes: 3 additions & 0 deletions images/jenkins-slave-full-centos7/contrib/bin/scl_enable
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# This will make scl collection binaries work out of box.
unset BASH_ENV PROMPT_COMMAND ENV
source scl_source enable rh-nodejs4
6 changes: 6 additions & 0 deletions images/jenkins-slave-full-centos7/contrib/google-chrome.repo
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[google-chrome]
name=google-chrome - \$basearch
baseurl=http://dl.google.com/linux/chrome/rpm/stable/\$basearch
enabled=1
gpgcheck=1
gpgkey=https://dl-ssl.google.com/linux/linux_signing_key.pub

0 comments on commit 4070f59

Please sign in to comment.