Add container search from docker daemon

Author: Taucher2003

lib/sagittarius/orchestrator/operator.rb

@@ -4,17 +4,21 @@ module Sagittarius
   module Orchestrator
     class Operator
       ORCHESTRATOR_LABEL_PREFIX = 'tech.code0.sagittarius.orchestrator'
+      CONTAINER_NAME_LABEL = "#{ORCHESTRATOR_LABEL_PREFIX}.container.name".freeze
+      NETWORK_NAME_LABEL = "#{ORCHESTRATOR_LABEL_PREFIX}.network.name".freeze
       VOLUME_NAME_LABEL = "#{ORCHESTRATOR_LABEL_PREFIX}.volume.name".freeze
       VOLUME_CONTAINER_LABEL = "#{ORCHESTRATOR_LABEL_PREFIX}.volume.container".freeze
 
+      NoContainerError = Class.new(StandardError)
+
       class << self
         def ensure_self_connected!
           ensure_network!
 
           self_container_id = State.self_container_id
-          return if self_container_id.nil?
+          raise NoContainerError, 'self_container_id is nil' if self_container_id.nil?
 
-          network.connect(State.self_container_id)
+          network.connect(self_container_id)
         end
 
         def ensure_container_up!(container)
@@ -33,27 +37,27 @@ def ensure_container_down!(container)
           destroy_container!(container) unless State[container.name].internal_container.nil?
         end
 
-        # private
-
-        def ensure_network!
-          return unless network.nil?
-
-          Docker::Network.create(
-            unique_name('code0'),
-            'Labels' => { ORCHESTRATOR_LABEL_PREFIX => 'network' }
-          )
-        end
-
         def network
           network_id = Docker::Network.all(filters: JSON.dump(
-            { 'label' => ["#{ORCHESTRATOR_LABEL_PREFIX}=network"] }
+            { 'label' => ["#{NETWORK_NAME_LABEL}=main"] }
           )).first&.id
 
           return nil if network_id.nil?
 
           Docker::Network.get(network_id)
         end
 
+        private
+
+        def ensure_network!
+          return unless network.nil?
+
+          Docker::Network.create(
+            unique_name('code0'),
+            'Labels' => { NETWORK_NAME_LABEL => 'main' }
+          )
+        end
+
         def ensure_volumes!(container)
           container.volumes.each_key do |name|
             next if State.volumes[container.name]&.key?(name.to_s)
@@ -77,7 +81,7 @@ def create_container!(container)
           container.internal_container = Docker::Container.create(
             'name' => unique_name(container.name),
             'Image' => container.image,
-            'Labels' => { ORCHESTRATOR_LABEL_PREFIX => container.name },
+            'Labels' => { CONTAINER_NAME_LABEL => container.name },
             'Cmd' => container.cmd,
             'Env' => container.environment_variables,
             'HostConfig' => {

lib/sagittarius/orchestrator/state.rb

@@ -14,9 +14,9 @@ def build!
         def build_containers!
           docker_containers = Docker::Container.all(
             all: true,
-            filters: JSON.dump({ 'label' => [Operator::ORCHESTRATOR_LABEL_PREFIX] })
+            filters: JSON.dump({ 'label' => [Operator::CONTAINER_NAME_LABEL] })
           ).to_h do |c|
-            label = c.info['Labels'][Operator::ORCHESTRATOR_LABEL_PREFIX]
+            label = c.info['Labels'][Operator::CONTAINER_NAME_LABEL]
             next [nil, nil] if label.nil?
 
             [label, c]
@@ -47,7 +47,7 @@ def [](container_name)
         end
 
         def self_container_id
-          container_id_from_cgroup
+          container_id_from_cgroup || container_id_from_daemon_search
         end
 
         private
@@ -57,6 +57,14 @@ def container_id_from_cgroup
         rescue Errno::ENOENT
           nil
         end
+
+        def container_id_from_daemon_search
+          Docker::Container.all
+                           .filter { |c| c.info['Image'].include?('sagittarius') }
+                           .reject { |c| c.info['Labels'].key?(Operator::CONTAINER_NAME_LABEL) }
+                           .find { |c| c.info['Command'] == '/rails/bin/docker-entrypoint ./bin/rails server' }
+                           &.id
+        end
       end
     end
   end