Repository: struts-site Updated Branches: refs/heads/master d4509abb7 -> 7f6817166
Switches to Alpine Linux to reduce size Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/7f681716 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/7f681716 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/7f681716 Branch: refs/heads/master Commit: 7f6817166ace7b4e475c90e417c5c1b792016a59 Parents: b33eee4 Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Mon Mar 14 17:26:29 2016 +0100 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Mon Mar 14 17:35:27 2016 +0100 ---------------------------------------------------------------------- Gemfile | 3 ++- Gemfile.lock | 2 ++ docker/Dockerfile | 63 +++++++++++------------------------------------ docker/run-jekyll.sh | 4 --- 4 files changed, 18 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-site/blob/7f681716/Gemfile ---------------------------------------------------------------------- diff --git a/Gemfile b/Gemfile index a8af254..00fc2c7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source 'https://rubygems.org' -ruby '2.2.3' +ruby '2.2.4' +gem 'json', '>= 1' gem 'jekyll', '~> 3' http://git-wip-us.apache.org/repos/asf/struts-site/blob/7f681716/Gemfile.lock ---------------------------------------------------------------------- diff --git a/Gemfile.lock b/Gemfile.lock index 12f4dba..6956446 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,6 +16,7 @@ GEM sass (~> 3.4) jekyll-watch (1.3.1) listen (~> 3.0) + json (1.8.3) kramdown (1.10.0) liquid (3.0.6) listen (3.0.6) @@ -34,6 +35,7 @@ PLATFORMS DEPENDENCIES jekyll (~> 3) + json (>= 1) BUNDLED WITH 1.11.2 http://git-wip-us.apache.org/repos/asf/struts-site/blob/7f681716/docker/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/Dockerfile b/docker/Dockerfile index ca7c0dc..8f85eca 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,58 +1,23 @@ -FROM debian +FROM alpine MAINTAINER Lukasz Lenart <lukaszlen...@apache.org> LABEL Description="This image is used to support building Apache Struts main website" RUN \ - apt-get update && \ - apt-get install -y \ - make \ - gcc \ - sudo \ - netcat \ - iproute \ - net-tools \ - vim \ - bzip2 \ - git-core \ - libssl-dev \ - libreadline-dev \ - zlib1g-dev \ - node \ - curl && \ - apt-get clean && \ + apk update && \ + apk upgrade && \ + apk add bash sudo curl-dev ruby-dev build-base libffi-dev && \ + apk add ruby ruby-io-console ruby-bundler nodejs && \ + gem clean && gem install bundler io-console --no-document && \ + sudo rm -rf /usr/lib/ruby/gems/*/cache/*.gem && \ - addgroup --system --gid 1000 jekyll && \ - adduser --system --ingroup jekyll --uid 1000 --home /home/jekyll --disabled-password jekyll && \ + rm -rf /var/cache/apk/* && \ + + addgroup -S -g 1000 jekyll && \ + adduser -S -G jekyll -u 1000 -h /home/jekyll -D jekyll && \ mkdir -p /srv/jekyll && \ chown jekyll:jekyll /srv/jekyll && \ echo "jekyll ALL=NOPASSWD:ALL" >> /etc/sudoers -ADD run-jekyll.sh /usr/bin/run-jekyll.sh -WORKDIR /srv/jekyll + EXPOSE 4000 +WORKDIR /srv/jekyll USER jekyll -RUN \ - cd && \ - - git clone git://github.com/sstephenson/rbenv.git .rbenv && \ - echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.profile && \ - echo 'eval "$(rbenv init -)"' >> ~/.profile && \ - . ~/.profile && \ - - git clone git://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build && \ - echo 'export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.profile && \ - . ~/.profile && \ - - git clone https://github.com/sstephenson/rbenv-gem-rehash.git ~/.rbenv/plugins/rbenv-gem-rehash && \ - - rbenv install 2.2.3 && \ - rbenv global 2.2.3 && \ - ruby -v && \ - echo "gem: --no-ri --no-rdoc" > ~/.gemrc && \ - - gem clean && gem install bundler --no-document && \ - - sudo rm -rf /usr/lib/ruby/gems/*/cache/*.gem -ENV HOME /home/jekyll -ENV PATH ${PATH}:${HOME}/.rbenv/plugins/ruby-build/bin -ENV PATH ${PATH}:${HOME}/.rbenv/bin -ENV PATH ${PATH}:${HOME}/.rbenv/shims -ENTRYPOINT ["/usr/bin/run-jekyll.sh"] +ENTRYPOINT bundle install && bundle exec jekyll serve --watch --trace --host=0.0.0.0 http://git-wip-us.apache.org/repos/asf/struts-site/blob/7f681716/docker/run-jekyll.sh ---------------------------------------------------------------------- diff --git a/docker/run-jekyll.sh b/docker/run-jekyll.sh deleted file mode 100755 index c0cc54f..0000000 --- a/docker/run-jekyll.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -bundle install -bundle exec jekyll serve --watch --trace --host=0.0.0.0
