Skip to content

Commit

Permalink
chore: Upgrade dev configs
Browse files Browse the repository at this point in the history
  • Loading branch information
bibendi committed Apr 24, 2017
1 parent 83ed2f6 commit 26f7955
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 37 deletions.
26 changes: 4 additions & 22 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
matrix:
include:
- DOCKER_RUBY_VERSION: 2.2
RUBY_IMAGE_TAG: 2.2-latest

- DOCKER_RUBY_VERSION: 1.9.3
RUBY_IMAGE_TAG: 1.9-latest

build:
test:
image: abakpress/dind-testing
Expand All @@ -14,30 +6,20 @@ build:
volumes:
- /home/data/drone/images:/images
- /home/data/drone/gems:/bundle
- /home/data/drone/key_cache:/ssh_keys
environment:
- COMPOSE_FILE_EXT=drone
- RUBY_IMAGE_TAG=2.2-latest
commands:
- wrapdocker docker -v

- 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
- fetch-images --image abakpress/ruby-app:$RUBY_IMAGE_TAG
- dip provision
- dip rspec

release:
image: abakpress/ruby-app:2.3-latest
image: abakpress/gem-publication
pull: true
when:
event: push
branch: release
matrix:
DOCKER_RUBY_VERSION: 2.2
commands:
- git config user.name "Automated Release"
- git config user.email [email protected]
- gem install apress-gems --source https://gems.railsc.ru
- apress-gem release --no-bump --no-pull --remote origin
- release-gem
7 changes: 0 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
source 'http://apress:[email protected]'
source 'https://rubygems.org'

# Specify your gem's dependencies in resque-integration.gemspec
if RUBY_VERSION < '2'
gem 'pry-debugger'
else
gem 'pry-byebug'
end

gemspec
3 changes: 1 addition & 2 deletions dip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,5 @@ interaction:

provision:
- docker volume create --name bundler_data

- dip bundle config --local https://gems.railsc.ru/ ${APRESS_GEMS_CREDENTIALS}
- dip clean
- dip bundle install
5 changes: 0 additions & 5 deletions docker-compose.development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@ services:
volumes:
- ../:/localgems
- bundler-data:/bundle
- ssh-data:/ssh:ro

volumes:
bundler-data:
external:
name: bundler_data

ssh-data:
external:
name: ssh_data
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ services:
image: abakpress/ruby-app:$RUBY_IMAGE_TAG
environment:
- BUNDLE_PATH=/bundle/$DOCKER_RUBY_VERSION
- SSH_AUTH_SOCK=/ssh/auth/sock
command: bash
volumes:
- .:/app
1 change: 1 addition & 0 deletions resque-integration.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ Gem::Specification.new do |gem|
gem.add_development_dependency 'simplecov'
gem.add_development_dependency 'mock_redis'
gem.add_development_dependency 'timecop'
gem.add_development_dependency 'pry-byebug'
end

0 comments on commit 26f7955

Please sign in to comment.