Skip to content

Commit

Permalink
Merge pull request #19 from artofhuman/master
Browse files Browse the repository at this point in the history
chore: remove ruby 1.9.3 and rails 3.1 support
  • Loading branch information
artofhuman authored Apr 3, 2017
2 parents 5fe9a1f + 682f2ea commit f3e4b89
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 52 deletions.
19 changes: 5 additions & 14 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
matrix:
include:
- DOCKER_RUBY_VERSION: 2.2
RUBY_IMAGE_TAG: 2.2-3

- DOCKER_RUBY_VERSION: 1.9.3
RUBY_IMAGE_TAG: 1.9.3-3

build:
image: abakpress/dind:3
image: abakpress/dind-testing
pull: true
privileged: true
volumes:
- /home/data/drone/images:/images
Expand All @@ -18,11 +11,9 @@ build:
commands:
- wrapdocker docker -v

- if [ ! -e /images/ssh-agent.tar ]; then docker pull whilp/ssh-agent; docker save whilp/ssh-agent > /images/ssh-agent.tar; fi
- if [ ! -e /images/ruby_$RUBY_IMAGE_TAG.tar ]; then docker pull abakpress/ruby:$RUBY_IMAGE_TAG; docker save abakpress/ruby:$RUBY_IMAGE_TAG > /images/ruby_$RUBY_IMAGE_TAG.tar; fi

- docker load -i /images/ssh-agent.tar
- docker load -i /images/ruby_$RUBY_IMAGE_TAG.tar
- fetch-images
--image whilp/ssh-agent
--image abakpress/ruby-app:$RUBY_IMAGE_TAG

- dip ssh add -T -v /ssh_keys -k /ssh_keys/id_rsa
- dip provision
Expand Down
6 changes: 0 additions & 6 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
appraise 'rails3.1' do
gem 'activerecord', '~> 3.1.12'
gem 'actionpack', '~> 3.1.12'
gem 'activesupport', '~> 3.1.12'
end

appraise 'rails3.2' do
gem 'activerecord', '~> 3.2.0'
gem 'actionpack', '~> 3.2.0'
Expand Down
6 changes: 0 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,3 @@ source 'https://rubygems.org'

# Specify your gem's dependencies in string_tools.gemspec
gemspec

if RUBY_VERSION < '2'
gem 'pry-debugger'
else
gem 'pry-byebug'
end
23 changes: 0 additions & 23 deletions Makefile

This file was deleted.

4 changes: 2 additions & 2 deletions dip.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: '1'

environment:
DOCKER_RUBY_VERSION: 1.9.3
RUBY_IMAGE_TAG: 1.9.3-3
DOCKER_RUBY_VERSION: 2.2
RUBY_IMAGE_TAG: 2.2-latest
COMPOSE_FILE_EXT: development
RAILS_ENV: test

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2'

services:
app:
image: abakpress/ruby:$RUBY_IMAGE_TAG
image: abakpress/ruby-app:$RUBY_IMAGE_TAG
environment:
- SSH_AUTH_SOCK=/ssh/auth/sock
- BUNDLE_PATH=/bundle/$DOCKER_RUBY_VERSION
Expand Down

0 comments on commit f3e4b89

Please sign in to comment.