berkeley_library-docker 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a8f366b628cad8dd6d516fe9180667fb4bd2908d331ad79437990ee4e0d865b
-  data.tar.gz: 70dd01ff23d3177c3430597abd7cbdee9657829599791f04299052b070efdee2
+  metadata.gz: 75df4187f362680f782f8ce0e4d7a5aa438c4f86f44d1337c0495253e1b4733a
+  data.tar.gz: 51fdf2f4e9f29080bda4d7fe93096c0d314def1649f6a7da70290324ca7f642a
 SHA512:
-  metadata.gz: 986553998d692b12fdf140ee55f08b75b7c4754ec829049242283b81894dd6ff3205a47830d9d4d3a7a1178198b3a18d255374a21eb0614943268bbebdf93406
-  data.tar.gz: 792ac78d25c7c14f7384ba968a0578a373fdc66d0e2e9765e4221db04c3b8665c1030af8edfc0835009e518bb0bdbd186d968a61759c8ad6ddc76ba5658f0caa
+  metadata.gz: 24714d86ebb5416d303acca6d31f46e1d3e4c7514afbf2fcee166638c7ba25c64cbc5e1d4fdbc49e97babc5568198d32c09909ab1bc43c0652c56a3140a9ff98
+  data.tar.gz: 31b41f95fe42a25a725c9d8702d00e4a922c41afb8df1b9503ed3efab626a206511ffbe69e925c8d26a0c6779afbb977c4427c4c81ced59e4edb1273c9baced2

data/lib/berkeley_library/docker/module_info.rb

@@ -7,7 +7,7 @@ module BerkeleyLibrary
       SUMMARY = 'Utility functions for Dockerizing Ruby apps'.freeze
       DESCRIPTION = 'Utility functions for making Ruby apps "just work" in Docker containers.'.freeze
       LICENSE = 'MIT'.freeze
-      VERSION = '0.0.1'.freeze
+      VERSION = '0.1.1'.freeze
       HOMEPAGE = 'https://github.com/BerkeleyLibrary/docker'.freeze
 
       private_class_method :new

data/lib/berkeley_library/docker/railtie.rb

@@ -3,7 +3,9 @@ require 'berkeley_library/docker/secret'
 module BerkeleyLibrary
   module Docker
     class Railtie < Rails::Railtie
-      config.before_configuration { Secret.load_secrets! }
+      NAME = 'berkeley_library-docker.load_secrets'.freeze
+
+      initializer(NAME, after: :initialize_logger) { Secret.load_secrets! }
     end
   end
 end

data/lib/berkeley_library/docker.rb

@@ -5,6 +5,20 @@ require 'berkeley_library/docker/railtie' if defined?(Rails::Railtie)
 
 module BerkeleyLibrary
   module Docker
-    #
+    class << self
+      def running_in_container?
+        File.exist?('/.dockerenv') || init_cgroup_is_dockerish?
+      end
+
+      private
+
+      def init_cgroup_is_dockerish?
+        begin
+          File.open('/proc/1/cgroup').read.match?(%r{(/docker|/lxc)})
+        rescue
+          false
+        end
+      end
+    end
   end
 end

data/spec/berkeley_library/docker/railtie_spec.rb

@@ -5,18 +5,33 @@ require 'spec_helper'
 module BerkeleyLibrary
   module Docker
     describe Railtie do
-      before do
-        expect(ENV['API_TOKEN']).to be nil
+      class TestApp < Rails::Application; end
+
+      let(:app) { TestApp.create }
+      let(:initializers) { app.initializers.tsort_each.collect(&:name) }
+      let(:railtie_name) { BerkeleyLibrary::Docker::Railtie::NAME }
+
+      it 'has the expected initializer name' do
+        expect(railtie_name).to eq 'berkeley_library-docker.load_secrets'
       end
 
       it 'causes rails to load the environment' do
         with_secret('API_TOKEN', 'd33db55f') do
-          class TestApp < Rails::Application; end
-          TestApp.create.initialize!
+          app = TestApp.create
+          expect(ENV['API_TOKEN']).to be nil
 
+          app.initialize!
           expect(ENV['API_TOKEN']).to eq 'd33db55f'
         end
       end
+
+      it 'loads after the logger and before configuration' do
+        railtie_index = initializers.find_index(railtie_name)
+        logger_index = initializers.find_index(:initialize_logger)
+        config_index = initializers.find_index(:load_config_initializers)
+
+        expect(railtie_index).to be_between(logger_index, config_index)
+      end
     end
   end
 end

data/spec/berkeley_library/docker_spec.rb

@@ -0,0 +1,77 @@
+require 'rails' # require Rails first to mimic load order
+require 'berkeley_library/docker'
+require 'spec_helper'
+
+module BerkeleyLibrary
+  describe Docker do
+    describe '#running_in_container?' do
+      DOCKERISH_CGROUP = <<~EOL
+        11:cpuacct,cpu:/docker/12345
+        10:devices:/docker/12345
+        9:hugetlb:/docker/12345
+        8:freezer:/docker/12345
+        7:blkio:/docker/12345
+        6:net_prio,net_cls:/docker/12345
+        5:memory:/docker/12345
+        4:pids:/docker/12345
+        3:perf_event:/docker/12345
+        2:cpuset:/docker/12345
+        1:name=systemd:/docker/12345
+      EOL
+
+      TRADITIONAL_CGROUP = <<~EOL
+        11:cpuacct,cpu:/
+        10:devices:/
+        9:hugetlb:/
+        8:freezer:/
+        7:blkio:/
+        6:net_prio,net_cls:/
+        5:memory:/
+        4:pids:/
+        3:perf_event:/
+        2:cpuset:/
+        1:name=systemd:/
+      EOL
+
+      it 'is true when /.dockerenv exists' do
+        mock_dockerenv
+        expect(BerkeleyLibrary::Docker.running_in_container?).to be true
+      end
+
+      it 'is true when /proc/1/cgroup is docker-like' do
+        mock_dockerenv(false)
+        mock_init_cgroup
+        expect(BerkeleyLibrary::Docker.running_in_container?).to be true
+      end
+
+      it 'is false when /proc/1/cgroup is traditional' do
+        mock_dockerenv(false)
+        mock_init_cgroup(false)
+        expect(BerkeleyLibrary::Docker.running_in_container?).to be false
+      end
+
+      it 'is false when /proc/1/cgroup does not exist' do
+        mock_dockerenv(false)
+        expect(File)
+          .to receive(:open).with('/proc/1/cgroup')
+          .and_raise(Errno::ENOENT)
+        expect(BerkeleyLibrary::Docker.running_in_container?).to be false
+      end
+
+      private
+
+      def mock_dockerenv(exists = true)
+        expect(File)
+          .to receive(:exist?).with('/.dockerenv')
+          .and_return(exists)
+      end
+
+      def mock_init_cgroup(dockerish = true)
+        expect(File)
+          .to receive(:open).with('/proc/1/cgroup')
+          .and_return(
+            StringIO.new(dockerish ? DOCKERISH_CGROUP : TRADITIONAL_CGROUP))
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkeley_library-docker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Dan Schmidt
@@ -101,6 +101,7 @@ files:
 - lib/berkeley_library/docker/secret.rb
 - spec/berkeley_library/docker/railtie_spec.rb
 - spec/berkeley_library/docker/secret_spec.rb
+- spec/berkeley_library/docker_spec.rb
 - spec/spec_helper.rb
 - spec/spec_utils.rb
 homepage: https://github.com/BerkeleyLibrary/docker
@@ -130,5 +131,6 @@ summary: Utility functions for Dockerizing Ruby apps
 test_files:
 - spec/berkeley_library/docker/railtie_spec.rb
 - spec/berkeley_library/docker/secret_spec.rb
+- spec/berkeley_library/docker_spec.rb
 - spec/spec_helper.rb
 - spec/spec_utils.rb