From 582d124c1e141e79dd3f6a3569d3020254dbc55d Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Thu, 3 Mar 2016 01:36:52 +0100 Subject: [PATCH] #1037 fixed ruby depdendencies * Locked in all Gemfile dependencies * Locked in all related apt-get installed package dependencies * Removed apt-get upgrade run from Dockerfile to make the above have any meaning * Removed redundant bundle install from .rultor.yml install section given that this is also run from Maven (site target) anyhow. --- .rultor.yml | 6 +----- Gemfile | 18 ++++++++---------- pom.xml | 2 +- src/docker/Dockerfile | 25 ++++++------------------- 4 files changed, 16 insertions(+), 35 deletions(-) diff --git a/.rultor.yml b/.rultor.yml index 6bed95cf39..b554e47697 100644 --- a/.rultor.yml +++ b/.rultor.yml @@ -7,10 +7,6 @@ install: |- sudo apt-get install bsdmainutils sudo gem install --no-rdoc --no-ri pdd sudo gem install --no-rdoc --no-ri est - bundle install - bundle update - bundle show jekyll - jekyll --version architect: - original-brownbear - yegor256 @@ -78,4 +74,4 @@ release: mvn clean site-deploy -Prultor -Psite --errors --settings ../settings.xml --batch-mode || echo 'site-deploy failed' commanders: - original-brownbear - - yegor256 \ No newline at end of file + - yegor256 diff --git a/Gemfile b/Gemfile index 56ea19ca1f..bc80b6497b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,15 +1,13 @@ -# -# Just run "bundle" -# source 'https://rubygems.org' +ruby '2.2.4' gem 'jekyll', '2.4.0' -gem 'sass' -gem 'jekyll-sass' +gem 'sass', '3.4.21' +gem 'jekyll-sass', '1.2.2' gem 'jekyll-plantuml', '1.0.2' gem 'jekyll-press' gem 'jgd', '1.3' -gem 'nokogiri' -gem 'mail' -gem 'uuidtools' -gem 'liquid' -gem 'redcarpet' +gem 'nokogiri', '1.6.7.2' +gem 'mail', '2.6.3' +gem 'uuidtools', '2.1.5' +gem 'liquid', '2.6.3' +gem 'redcarpet', '3.3.4' diff --git a/pom.xml b/pom.xml index 5be4d7c193..6665c7206a 100644 --- a/pom.xml +++ b/pom.xml @@ -941,7 +941,7 @@ bundle - install + update diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile index 79282d1c5c..04add861d9 100644 --- a/src/docker/Dockerfile +++ b/src/docker/Dockerfile @@ -63,21 +63,12 @@ RUN apt-get install -y ssh && \ chmod 0755 /var/run/sshd # Ruby -RUN apt-get install -y libmagic-dev zlib1g-dev +RUN apt-get update && apt-get install -y libmagic-dev=1:5.14-2ubuntu3.3 \ + zlib1g-dev=1:1.2.8.dfsg-1ubuntu1 RUN apt-add-repository ppa:brightbox/ruby-ng -RUN apt-get update -RUN apt-get install -y ruby2.2 ruby2.2-dev -RUN gem update && gem install nokogiri && gem install bundler - -# Ruby via RVM -#RUN apt-add-repository -y ppa:rael-gc/rvm -#RUN apt-get update -#RUN sudo apt-get install -y rvm -#RUN /bin/bash -l -c "rvm install ruby" -#RUN /bin/bash -l -c "gem update" -#RUN /bin/bash -l -c "gem install nokogiri" -#RUN /bin/bash -l -c "gem install bundler" -#RUN echo 'source /usr/share/rvm/scripts/rvm' >> /etc/bash.bashrc +RUN apt-get update && apt-get install -y ruby2.2=2.2.4-1bbox1~trusty1 \ + ruby2.2-dev=2.2.4-1bbox1~trusty1 +RUN gem update && gem install nokogiri:1.6.7.2 && gem install bundler:1.11.2 # PHP RUN apt-get install -y php5 php5-dev php-pear @@ -124,7 +115,7 @@ RUN wget --quiet "http://mirror.dkd.de/apache/maven/maven-3/${MAVEN_VERSION}/bin update-alternatives --install /usr/bin/mvn mvn "${M2_HOME}/bin/mvn" 1 && \ update-alternatives --config mvn -RUN gem install jekyll +RUN gem install jekyll:2.4.0 ENV MAVEN_OPTS "-Xms512m -Xmx2g" ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64 @@ -135,10 +126,6 @@ RUN cd rultor && \ cd .. && \ rm -rf rultor -# One more time, right before the end -RUN apt-get update -y -RUN apt-get upgrade -qq -y - # Clean up RUN rm -rf /tmp/* RUN rm -rf /root/.ssh