From 5490a4ea0f39686dc9e3e34a5ccc8066dc7374cb Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 29 May 2015 14:51:02 +1000 Subject: [PATCH] remove old unused docker images, update version --- image/base_21/Dockerfile | 71 -------------------------- image/base_21/runit-1 | 3 -- image/base_21/runit-1.d-cleanup-pids | 3 -- image/base_21/runit-2 | 2 - image/base_22/Dockerfile | 4 +- image/discourse/Dockerfile | 4 +- image/discourse_21/Dockerfile | 22 -------- image/discourse_22/Dockerfile | 21 -------- image/discourse_dev/Dockerfile | 2 +- image/discourse_fast_switch/Dockerfile | 2 +- image/discourse_test/Dockerfile | 5 +- image/nsenter/Dockerfile | 5 -- 12 files changed, 9 insertions(+), 135 deletions(-) delete mode 100644 image/base_21/Dockerfile delete mode 100755 image/base_21/runit-1 delete mode 100755 image/base_21/runit-1.d-cleanup-pids delete mode 100755 image/base_21/runit-2 delete mode 100644 image/discourse_21/Dockerfile delete mode 100644 image/discourse_22/Dockerfile delete mode 100644 image/nsenter/Dockerfile diff --git a/image/base_21/Dockerfile b/image/base_21/Dockerfile deleted file mode 100644 index 6bc209a..0000000 --- a/image/base_21/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -# Official repo only has a ppa for postgresql 9.3 at the moment (14/3/2014) -# When new LTS ships we can upgrade - -# VERSION 0.2.0 -FROM ubuntu:14.04 - -MAINTAINER Sam Saffron "https://twitter.com/samsaffron" - -RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\ - apt-get -y install fping &&\ - sh -c "fping proxy && echo 'Acquire { Retries \"0\"; HTTP { Proxy \"http://proxy:3128\";}; };' > /etc/apt/apt.conf.d/40proxy || true" &&\ - apt-get -y update &&\ - apt-get -y install software-properties-common &&\ - add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe" &&\ - add-apt-repository "deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc)-updates main universe" &&\ - apt-get -y update &&\ - apt-mark hold initscripts &&\ - apt-get -y upgrade &&\ - add-apt-repository -y ppa:rwky/redis &&\ - add-apt-repository -y ppa:nginx/stable &&\ - apt-get install -y curl && curl http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - &&\ - echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" | \ - tee /etc/apt/sources.list.d/postgres.list &&\ - apt-get -y update &&\ - apt-get -y install build-essential git curl wget \ - libxslt-dev libcurl4-openssl-dev \ - libssl-dev libyaml-dev libtool \ - libxml2-dev gawk \ - pngcrush imagemagick gifsicle \ - postgresql-9.3 postgresql-client-9.3 \ - postgresql-contrib-9.3 libpq-dev libreadline-dev \ - nginx language-pack-en sudo cron \ - psmisc rsyslog &&\ - dpkg-divert --local --rename --add /sbin/initctl &&\ - sh -c "test -f /sbin/initctl || ln -s /bin/true /sbin/initctl" &&\ - apt-get -y install redis-server haproxy openssh-server &&\ - echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\ - mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\ - cd /src/ruby-build && ./install.sh &&\ - cd / && rm -rf /src/ruby-build &&\ - echo install_package "yaml-0.1.6" "http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz#5fe00cda18ca5daeb43762b80c38e06e" --if needs_yaml > /src/2.1.2.discourse &&\ - echo install_package "ruby-v_2_1_2_discourse" "https://github.com/SamSaffron/ruby/archive/v_2_1_2_discourse.tar.gz#98741e3cbfd00ae2931b2c0edb0f0698" ldflags_dirs standard verify_openssl >> /src/2.1.2.discourse &&\ - apt-get -y install ruby bison &&\ - ruby-build /src/2.1.2.discourse /usr/local &&\ - apt-get -y remove ruby1.8 &&\ - gem update --system &&\ - gem install bundler &&\ - cd / && git clone https://github.com/SamSaffron/pups.git &&\ - mkdir /jemalloc && cd /jemalloc &&\ - wget http://www.canonware.com/download/jemalloc/jemalloc-3.4.1.tar.bz2 &&\ - tar -xjf jemalloc-3.4.1.tar.bz2 && cd jemalloc-3.4.1 && ./configure && make &&\ - mv lib/libjemalloc.so.1 /usr/lib && cd / && rm -rf /jemalloc &&\ - apt-get -y install runit monit socat &&\ - apt-get clean &&\ - rm -f /etc/apt/apt.conf.d/40proxy &&\ - locale-gen en_US &&\ - mkdir -p /etc/runit/1.d &&\ - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\ - tar -xjf phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\ - rm phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\ - cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /bin/phantomjs &&\ - rm -fr phantomjs-1.9.7-linux-x86_64 &&\ - wget http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz &&\ - tar -xf pngout-20150319-linux.tar.gz &&\ - rm pngout-20150319-linux.tar.gz &&\ - cp pngout-20150319-linux/x86_64/pngout /bin/pngout &&\ - rm -rf pngout-20150319-linux - -ADD runit-1 /etc/runit/1 -ADD runit-1.d-cleanup-pids /etc/runit/1.d/cleanup-pids -ADD runit-2 /etc/runit/2 diff --git a/image/base_21/runit-1 b/image/base_21/runit-1 deleted file mode 100755 index e9c842e..0000000 --- a/image/base_21/runit-1 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -/bin/run-parts --verbose --exit-on-error /etc/runit/1.d diff --git a/image/base_21/runit-1.d-cleanup-pids b/image/base_21/runit-1.d-cleanup-pids deleted file mode 100755 index cf5c3da..0000000 --- a/image/base_21/runit-1.d-cleanup-pids +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -/bin/echo "Cleaning stale PID files" -/bin/rm -f /var/run/*.pid diff --git a/image/base_21/runit-2 b/image/base_21/runit-2 deleted file mode 100755 index b3ec10e..0000000 --- a/image/base_21/runit-2 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -/usr/bin/runsvdir -P /etc/service diff --git a/image/base_22/Dockerfile b/image/base_22/Dockerfile index a0adc09..158b512 100644 --- a/image/base_22/Dockerfile +++ b/image/base_22/Dockerfile @@ -1,8 +1,8 @@ # Official repo only has a ppa for postgresql 9.3 at the moment (14/3/2014) # When new LTS ships we can upgrade -# VERSION 1.0.11 -FROM samsaffron/discourse_base:1.0.11 +# VERSION 1.0.12 +FROM samsaffron/discourse_base:1.0.12 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile index 1e3c9d8..90eee72 100644 --- a/image/discourse/Dockerfile +++ b/image/discourse/Dockerfile @@ -1,5 +1,5 @@ -# Current version 1.0.11 -FROM samsaffron/discourse_base:1.0.11 +# Current version 1.0.12 +FROM samsaffron/discourse_base:1.0.12 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_21/Dockerfile b/image/discourse_21/Dockerfile deleted file mode 100644 index f78962a..0000000 --- a/image/discourse_21/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# Current version 2.1.2.2 -FROM samsaffron/discourse_base_21:2.1.2.1 - -MAINTAINER Sam Saffron "https://twitter.com/samsaffron" - -RUN useradd discourse -s /bin/bash -m -U &&\ - mkdir /var/www && cd /var/www &&\ - git clone https://github.com/discourse/discourse.git &&\ - cd discourse &&\ - git remote set-branches --add origin tests-passed &&\ - cd .. &&\ - chown -R discourse:discourse /var/www/discourse &&\ - cd /var/www/discourse &&\ - sudo -u discourse RAILS4=1 bundle install --deployment \ - --without test --without development &&\ - cd /var/www/discourse/vendor/bundle &&\ - find . -name tmp -type d | xargs rm -rf && cd / &&\ - wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\ - tar -xjf phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\ - rm phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\ - cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /bin/phantomjs &&\ - rm -fr phantomjs-1.9.7-linux-x86_64 diff --git a/image/discourse_22/Dockerfile b/image/discourse_22/Dockerfile deleted file mode 100644 index f7f7032..0000000 --- a/image/discourse_22/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -# Current version 1.0.8 -FROM samsaffron/discourse_base_22:1.0.0 - -MAINTAINER Sam Saffron "https://twitter.com/samsaffron" - -# Discourse specific bits -RUN useradd discourse -s /bin/bash -m -U &&\ - mkdir -p /var/www && cd /var/www &&\ - git clone https://github.com/discourse/discourse.git &&\ - cd discourse &&\ - git remote set-branches --add origin tests-passed &&\ - chown -R discourse:discourse /var/www/discourse &&\ - cd /var/www/discourse &&\ - sudo -u discourse bundle install --deployment \ - --without test --without development &&\ - find /var/www/discourse/vendor/bundle -name tmp -type d -exec rm -rf {} + - - -# For a smaller but less flexible image: -#RUN apt-get -y autoremove build-essential gcc gcc-4.7 .+-dev -#RUN echo image size: $(du -hsx /) diff --git a/image/discourse_dev/Dockerfile b/image/discourse_dev/Dockerfile index c053820..38a5623 100644 --- a/image/discourse_dev/Dockerfile +++ b/image/discourse_dev/Dockerfile @@ -1,4 +1,4 @@ -FROM samsaffron/discourse_21:2.1.2.1 +FROM samsaffron/discourse_fast_switch MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_fast_switch/Dockerfile b/image/discourse_fast_switch/Dockerfile index 0e2d58e..c1a8267 100644 --- a/image/discourse_fast_switch/Dockerfile +++ b/image/discourse_fast_switch/Dockerfile @@ -1,6 +1,6 @@ # Allow to easily switch Ruby version in images that derive off this -FROM samsaffron/discourse:1.0.11 +FROM samsaffron/discourse:1.0.12 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile index 7b3a041..a91ff79 100644 --- a/image/discourse_test/Dockerfile +++ b/image/discourse_test/Dockerfile @@ -1,8 +1,9 @@ -FROM samsaffron/discourse_22:1.0.0 +FROM samsaffron/discourse_fast_switch:1.0.12 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" -RUN cd /var/www/discourse &&\ +RUN use_22 &&\ + cd /var/www/discourse &&\ chown -R discourse . &&\ rm -fr .bundle &&\ sudo -u discourse git pull &&\ diff --git a/image/nsenter/Dockerfile b/image/nsenter/Dockerfile deleted file mode 100644 index 119e631..0000000 --- a/image/nsenter/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -# NOTE build nsenter locally -# see: https://github.com/jpetazzo/nsenter - -FROM busybox -ADD nsenter /nsenter -- 2.25.1