diff --git a/Gemfile.lock b/Gemfile.lock index 05abbea5..a762a7d6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -244,16 +244,16 @@ GEM mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) parallel (1.19.1) - parser (2.6.5.0) + parser (2.7.0.1) ast (~> 2.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - pg (1.1.4) + pg (1.2.0) popper_js (1.14.5) pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (4.0.1) + public_suffix (4.0.2) puma (4.3.1) nio4r (~> 2.0) pundit (2.1.0) @@ -297,7 +297,7 @@ GEM rainbow (3.0.0) rake (13.0.1) rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-inotify (0.10.1) ffi (~> 1.0) rbnacl (4.0.2) ffi @@ -331,7 +331,7 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.4.0) + rubocop-rails (2.4.1) rack (>= 1.1) rubocop (>= 0.72.0) ruby-enum (0.7.2) @@ -351,7 +351,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - selenium-webdriver (3.142.6) + selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) simpleidn (0.1.1) @@ -360,7 +360,7 @@ GEM spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (3.7.2) + sprockets (4.0.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) @@ -383,7 +383,7 @@ GEM turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) diff --git a/Makefile b/Makefile index f420e73f..84006b5b 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,7 @@ build: docker build --build-arg="RAILS_MASTER_KEY=`cat config/master.key`" -t sutty/sutty . save: - docker save sutty/sutty:latest | gzip > sutty.latest.gz - scp sutty.latest.gz root@sutty.nl: + docker save sutty/sutty:latest | gzip | ssh root@sutty.nl docker load load: ssh root@sutty.nl sh -c "gunzip -c sutty.latest.gz | docker load" @@ -24,7 +23,7 @@ load: gem_dir := $(shell readlink -f ../gems) gems := $(shell bundle show --paths | xargs -I {} sh -c 'test -f {}/ext/*/extconf.rb && basename {}') -gems += $(shell bundle show --paths | xargs -I {} sh -c 'find {} -name extconf.rb && basename {}') +gems += $(shell bundle show --paths | xargs -I {} sh -c 'test -f {}/ext/extconf.rb && basename {}') gems_musl := $(patsubst %,$(gem_dir)/%-x86_64-linux-musl.gem,$(gems)) $(gem_dir)/%-x86_64-linux-musl.gem: @@ -53,8 +52,8 @@ test-container: $(dirs) -v $(PWD)/root/public:/srv/http/_public \ -v $(PWD)/config/credentials.yml.enc:/srv/http/config/credentials.yml.enc \ -e RAILS_MASTER_KEY=`cat config/master.key` \ + -e RAILS_ENV=production \ -it \ --rm \ --name=sutty \ - sutty/sutty \ - /bin/sh + sutty/sutty /bin/sh