Skip to content

Commit

Permalink
Merge pull request #436 from tmobile/develop
Browse files Browse the repository at this point in the history
Release - v1.12
  • Loading branch information
suryajak authored Jan 10, 2019
2 parents 1d2b629 + 69c3d4e commit 2ea8e6f
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 8 deletions.
2 changes: 1 addition & 1 deletion installscripts/cookbooks/Policyfile.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
cookbook 'nodejs', '~> 5.0.0'
cookbook 'cloudcli', '~> 1.2.0'
cookbook 'jenkins', path: './jenkins'
run_list 'jenkins::setupjenkins', 'jenkins::sonarqube-scanner', 'jenkins::configurejenkins', 'jenkins::installgolang'
run_list 'jenkins::setupjenkins', 'jenkins::sonarqube-scanner', 'jenkins::configurejenkins', 'jenkins::installgolang', 'jenkins::installpython3'
19 changes: 19 additions & 0 deletions installscripts/cookbooks/jenkins/recipes/installpython3.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
if node['dockerizedJenkins'] == false
# Install python3 runtime
bash 'install-python3' do
code <<-EOH
yum install -y https://centos7.iuscommunity.org/ius-release.rpm
yum update
yum install -y python36u python36u-libs python36u-devel python36u-pip
EOH
end

#link python3
link '/usr/bin/python3' do
to '/usr/bin/python3.6'
end
# link pip3
link '/usr/bin/pip3' do
to '/usr/bin/pip3.6'
end
end
16 changes: 9 additions & 7 deletions installscripts/dockerfiles/jenkins-ce/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@ MAINTAINER JazzOSS Team
ARG goVersion=1.10.3
# Switching to root to configure the image with system packages
USER root
RUN apt-get update && apt-get install -y vim curl sudo libtool autoconf make unzip rsync gcc autogen shtool pkg-config lsb-release python python-dev python-pip python-setuptools groff less && \
curl https://bootstrap.pypa.io/get-pip.py | python && pip install --upgrade awscli && apt-get clean && pip install virtualenv && /usr/bin/easy_install virtualenv
RUN echo "deb http://ftp.fr.debian.org/debian testing main" >> /etc/apt/sources.list && apt-get update && apt-get install -y vim curl sudo libtool autoconf make unzip rsync gcc autogen shtool pkg-config lsb-release python python-dev python-pip python-setuptools groff less \
python3.6 python3-dev python3-pip python3.6-venv build-essential libssl-dev libffi-dev python-virtualenv && ln -sf /usr/bin/python2.7 /usr/bin/python && ln -sf /usr/bin/python3.6 /usr/bin/python3 && \
curl https://bootstrap.pypa.io/get-pip.py | python && curl https://bootstrap.pypa.io/get-pip.py | python3 && pip install --upgrade awscli && apt-get clean
RUN wget -O /opt/apache-maven-3.5.2-bin.tar.gz https://archive.apache.org/dist/maven/maven-3/3.5.2/binaries/apache-maven-3.5.2-bin.tar.gz && tar xzvf /opt/apache-maven-3.5.2-bin.tar.gz -C /opt && export PATH=$PATH:/opt/apache-maven-3.5.2/bin >> /etc/profile.d/maven.sh && ln -sf /opt/apache-maven-3.5.2/bin/mvn /usr/bin/mvn
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash && apt-get install -y nodejs && npm install -global serverless@1.30.0 @angular/cli@1.7.3 jshint
# Install scripts for golang

# Install scripts for golang
RUN curl -O https://storage.googleapis.com/golang/go${goVersion}.linux-amd64.tar.gz && tar -xvf go${goVersion}.linux-amd64.tar.gz && mv go /usr/local
ENV GOROOT /usr/local/go
ENV GOBIN /usr/local/go/bin
ENV GOPATH /usr/local/go/src
ENV PATH $GOROOT:$GOBIN:$GOPATH:$PATH
ENV GOROOT /usr/local/go
ENV GOBIN /usr/local/go/bin
ENV GOPATH /usr/local/go/src
ENV PATH $GOROOT:$GOBIN:$GOPATH:$PATH
RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh

# Copying plugins list. Downlading and installing plugins from Jenkins PluginsManager
Expand Down

0 comments on commit 2ea8e6f

Please sign in to comment.