takelage 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36222b3d12d53faad7c7c4813283a8aebce977dab41bacd4a53bb43821567ad8
-  data.tar.gz: 92e81da7d19014f82535f46a53c66001b425cdebbde5911fcad07f1a46487707
+  metadata.gz: 2fd909364c4dbb82c0c9e8ac1ba6ccfed67e51fe56794b7a6aa36af3ea86e6f2
+  data.tar.gz: b5343bcba1852c0d56ce454c5ff8ed6172220747087b13a0b24cd8c4748761aa
 SHA512:
-  metadata.gz: 6e751053eefb7223c0e67d6c86f0b06a2fde03773d8f86c8decc05f56c5a357d254d75d38f6da6fc4b07f6be993dd445ee7a7746c86bb09bb384f77a5d96fecb
-  data.tar.gz: 2564bc2522442ce5ff148a3a11b8b6d805d3fa9dcc74b15f11116c1fa0797721f8976c625c793aab92a47bc08bbe404067757c80c99b2532be349e56579f5428
+  metadata.gz: 1565a6d13da908d8fae2f10bcd0e45264945559c32483d90952940a1225fd5c3643579a8f20e9ab3c6d9e0a4e10d2618c0d0e01a027049e8ffcf25b53c19667b
+  data.tar.gz: d395c04730066c07d2b288913b0353538305e03d5cda5717414f5475357a2b19a7e0286f5f85f3548d69d9ae1ee6d208d85ab63d1de2677643566594a5e782fc

data/README.md

@@ -16,8 +16,8 @@ The takelage devops framework consists of these projects:
 
 | App | Description |
 | --- | ----------- |
-| *[takelage-cli](https://github.com/geospin-takelage/takelage-cli)* | takelage command line interface |
 | *[takelage-dev](https://github.com/geospin-takelage/takelage-dev)* | takelage development environment |
+| *[takelage-cli](https://github.com/geospin-takelage/takelage-cli)* | takelage command line interface |
 | *[takelage-bit](https://github.com/geospin-takelage/takelage-bit)* | takelage [bit](https://github.com/teambit/bit) server | 
 
 ## Installation

data/lib/takelage/docker/container/module.rb

@@ -9,6 +9,7 @@ module DockerContainerModule
 
     docker_socket_start
 
+    _create_network @hostname unless _network_check_existing @hostname
     _create_container @hostname unless docker_container_check_existing @hostname
     _run_command_in_container @hostname, command
   end
@@ -19,6 +20,7 @@ module DockerContainerModule
 
     exit false unless configured? %w(docker_repo docker_image docker_tag)
 
+    _create_network @hostname unless _network_check_existing @hostname
     _create_container @hostname unless docker_container_check_existing @hostname
   end
 
@@ -30,6 +32,7 @@ module DockerContainerModule
 
     docker_socket_start
 
+    _create_network @hostname unless _network_check_existing @hostname
     _create_container @hostname unless docker_container_check_existing @hostname
     _enter_container @hostname
   end
@@ -40,8 +43,16 @@ module DockerContainerModule
 
     exit false unless configured? %w(docker_image)
 
+    networks = []
+
     _get_containers.each do |container|
+      name = _get_container_name_by_id container
       _stop_container container
+      networks << name unless networks.include? name
+    end
+
+    networks.each do |network|
+      _remove_network network if _network_check_existing network
     end
   end
 
@@ -51,8 +62,18 @@ module DockerContainerModule
 
     exit false unless configured? %w(docker_image)
 
+    networks = []
+
     _get_containers.each do |container|
-      _stop_container container if docker_container_check_orphaned container
+      if docker_container_check_orphaned container
+        name = _get_container_name_by_id container
+        _stop_container container
+        networks << name unless networks.include? name
+      end
+    end
+
+    networks.each do |network|
+      _remove_network network if _network_check_existing network
     end
   end
 
@@ -90,6 +111,7 @@ module DockerContainerModule
         "--env TZ=#{@timezone} " +
         "--hostname #{container} " +
         "--name #{container} " +
+        "--network #{container} " +
         '--privileged ' +
         '--rm ' +
         '--tty ' +
@@ -110,6 +132,16 @@ module DockerContainerModule
     run cmd_docker_create
   end
 
+  # Create docker network.
+  def _create_network(network)
+    log.debug "Create network \"#{network}\""
+
+    cmd_create_network = 'docker network create ' +
+        "#{network}"
+
+    run cmd_create_network
+  end
+
   # Enter existing docker container.
   def _enter_container(container)
     log.debug "Entering container \"#{container}\""
@@ -129,6 +161,19 @@ module DockerContainerModule
     run_and_exit cmd_docker_enter
   end
 
+  # Get container name by id.
+  def _get_container_name_by_id container
+    log.debug "Getting name of container #{container}"
+
+    cmd_get_container_name_by_id = 'docker ps ' +
+        "--filter id=#{container} "+
+        '--format "{{.Names}}"'
+
+    stdout_str, stderr_str, status = run_and_check cmd_get_container_name_by_id
+
+    stdout_str.chomp
+  end
+
   # Get all docker containers.
   # @return [Array] list of docker containers
   def _get_containers
@@ -145,14 +190,33 @@ module DockerContainerModule
     stdout_str.split(/\n+/)
   end
 
-  # Remove container.
-  def _stop_container(container)
-    log.debug "Stopping container \"#{container}\""
+  # Check if docker network exists.
+  def _network_check_existing(network)
+    log.debug "Checking if network \"#{network}\" is existing"
 
-    cmd_docker_stop = 'docker stop ' +
-        "#{container}"
+    cmd_docker_network_exist = 'docker network ls ' +
+        '--quiet ' +
+        "--filter name=#{network}"
 
-    run cmd_docker_stop
+    stdout_str, stderr_str, status = run_and_check cmd_docker_network_exist
+
+    if stdout_str.to_s.strip.empty?
+      log.debug "Network \"#{network}\" is not existing"
+      return false
+    end
+
+    log.debug "Network \"#{network}\" is existing"
+    true
+  end
+
+  # Remove docker network.
+  def _remove_network network
+    log.debug "Remove network \"#{network}\""
+
+    cmd_remove_network = 'docker network rm ' +
+        "#{network}"
+
+    run cmd_remove_network
   end
 
   # Enter existing docker container.
@@ -166,4 +230,14 @@ module DockerContainerModule
 
     run_and_exit cmd_docker_run_command
   end
+
+  # Stop container.
+  def _stop_container(container)
+    log.debug "Stopping container \"#{container}\""
+
+    cmd_docker_stop = 'docker stop ' +
+        "#{container}"
+
+    run cmd_docker_stop
+  end
 end

data/lib/takelage/lib/system.rb

@@ -9,7 +9,7 @@ module SystemModule
   # Run a command and return the result.
   # @return [Boolean] success of command run
   def run_and_check(command)
-    log.debug "Running command '#{command}'"
+    log.debug "Running command \"#{command}\""
     stdout_str, stderr_str, status = Open3.capture3 command
     return stdout_str, stderr_str, status
   end
@@ -65,7 +65,7 @@ module SystemModule
   # Run a command.
   # @return [String] stdout of command
   def run(command, realtime=false)
-    log.debug "Running command '#{command}'"
+    log.debug "Running command \"#{command}\""
     stdout_str = ''
     stderr_str = ''
     status = ''
@@ -91,13 +91,13 @@ module SystemModule
 
   # Use Kernel#exec to replace the ruby process with a command.
   def run_and_exit(command)
-    log.debug "Running command '#{command}' and exiting afterwards"
+    log.debug "Running command \"#{command}\" and exiting afterwards"
     exec command
   end
 
   # Use Kernel#fork and Kernel#exec to run a command as a background process.
   def run_and_fork(command)
-    log.debug "Running command '#{command}' as a background process"
+    log.debug "Running command \"#{command}\" as a background process"
     job = fork do
       exec command
     end

data/lib/takelage/version

@@ -1 +1 @@
-0.2.1
+0.3.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takelage
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Geospin