penkit 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d70da81abc9263879c5ee641dcc24d19bf7d4fea
-  data.tar.gz: 238e150cd6ff9bb69cdaa3b0276cf09ca38c5cdf
+  metadata.gz: 4aff7392e33cb2150d8948db8879aff815049bcf
+  data.tar.gz: d9d84dbfbe1364f39e1641c9bd503f3036f87025
 SHA512:
-  metadata.gz: 438fdc93bad785f612d4e781f635be78d9296b11fcd8bd03517b4b5429af9e5879aae33f504d1a2e66b831d48f45ac167ef68b3fcc3b25bc4d5bcbb6f195841e
-  data.tar.gz: 9d565f1cfbf336705b4ac8762b4c16a29c04c81d0e1762620e6e5b35079f70a24ae9d06870385876f526b2df6c76ac0a28fd13e620c39f03c316d35323000cb4
+  metadata.gz: c7fd8b16d5960568d8191fc722ea7e0fcea1026b53ef9bc9811adced3862bb3ee276003feff96df9541533fc91a8da07cb7c1acacf84fce5d67f33c4513c6f54
+  data.tar.gz: e24ed656da862991a16d2da55692f2bda92220eded21ff6e00ae37cf14e14de038c411b43a8fbb7e6ec03f6a7a88704fe311977371833632702230e3bcfb6259

data/config/php.yml

@@ -0,0 +1,32 @@
+version: "2.0"
+services:
+  wordpress:
+    image: ${DOCKER_IMAGE}
+    container_name: ${DOCKER_NAME}
+    depends_on:
+      - mysql
+    environment:
+      MYSQL_HOST: ${DOCKER_NAME}_mysql
+      MYSQL_USER: phpuser
+      MYSQL_PASSWORD: password
+      MYSQL_NAME: phpdb
+    labels:
+      penkit: "true"
+    networks:
+      penkit:
+
+  mysql:
+    image: penkit/mysql:latest
+    container_name: ${DOCKER_NAME}_mysql
+    environment:
+      MYSQL_USER: phpuser
+      MYSQL_PASSWORD: password
+      MYSQL_DATABASE: phpdb
+    labels:
+      penkit: "true"
+    networks:
+      penkit:
+
+networks:
+  penkit:
+    external: true

data/lib/penkit/cli/container/ps.rb

@@ -1,8 +1,8 @@
 module Penkit
   class CLI < Thor
-    desc "ps", "List penkit docker containers"
-    def ps
-      docker.ps
+    desc "ps [ARGS...]", "List penkit docker containers"
+    def ps(*args)
+      docker.ps(*args)
     end
   end
 end

data/lib/penkit/cli/container/pull.rb

@@ -0,0 +1,8 @@
+module Penkit
+  class CLI < Thor
+    desc "pull IMAGE", "Pull most recent version of an image"
+    def pull(image)
+      docker.pull(image)
+    end
+  end
+end

data/lib/penkit/cli/container/rm.rb

@@ -1,6 +1,7 @@
 module Penkit
   class CLI < Thor
     desc "rm [CONTAINER...]", "Remove penkit docker containers"
+    option :force, desc: "Do not ask to confirm removal", type: :boolean, aliases: "f"
     def rm(*containers)
       if containers.any?
         docker.rm(*containers)
@@ -17,6 +18,7 @@ module Penkit
     end
 
     def rm_all?(containers)
+      return true if options[:force]
       return false if containers.size == 0
       message = "Are you sure you want to remove %d %s? [y/N]"
       word = containers.size > 1 ? "containers" : "container"

data/lib/penkit/cli/container/start.rb

@@ -3,6 +3,8 @@ module Penkit
     desc "start [OPTIONS] IMAGE", "Start a penkit docker image"
     option :name, desc: "Override name and hostname of container"
     def start(image)
+      puts "Pulling latest image..."
+      docker.pull(image, quiet: true) # Quietly updates the image
       if has_config?(image)
         opts = options.dup
         opts[:name] ||= unique_name(image)

data/lib/penkit/cli/container/stop.rb

@@ -1,6 +1,7 @@
 module Penkit
   class CLI < Thor
     desc "stop [CONTAINER...]", "Stop penkit docker containers"
+    option :force, desc: "Do not ask to confirm stop", type: :boolean, aliases: "f"
     def stop(*containers)
       if containers.any?
         docker.stop(*containers)
@@ -17,6 +18,7 @@ module Penkit
     end
 
     def stop_all?(containers)
+      return true if options[:force]
       return false if containers.size == 0
       message = "Are you sure you want to stop %d %s? [y/N]"
       word = containers.size > 1 ? "containers" : "container"

data/lib/penkit/cli/penkit.rb

@@ -4,6 +4,7 @@ require "penkit/cli/container/ps"
 require "penkit/cli/container/rm"
 require "penkit/cli/container/start"
 require "penkit/cli/container/stop"
+require "penkit/cli/container/pull"
 require "penkit/cli/tools"
 
 module Penkit

data/lib/penkit/cli/tools.rb

@@ -17,11 +17,13 @@ module Penkit
       docker.run("cli:metasploit", *args)
     end
 
-    desc "netcat [ARGS...]", "Run netcat on the penkit docker network"
+    desc "nc|netcat [ARGS...]", "Run netcat on the penkit docker network"
     def netcat(*args)
       docker.run("cli:net", "nc", *args)
     end
 
+    map "nc" => "netcat"
+
     desc "nmap [ARGS...]", "Run nmap on the penkit docker network"
     def nmap(*args)
       docker.run("cli:net", "nmap", *args)

data/lib/penkit/docker.rb

@@ -4,6 +4,7 @@ require "penkit/docker/ps"
 require "penkit/docker/rm"
 require "penkit/docker/start"
 require "penkit/docker/stop"
+require "penkit/docker/pull"
 
 module Penkit
   class Docker

data/lib/penkit/docker/ps.rb

@@ -12,8 +12,8 @@ module Penkit
       IO.popen(["docker", "ps", "-q", *filter_options]).readlines.map(&:strip)
     end
 
-    def ps
-      exec("docker", "ps", *filter_options)
+    def ps(*args)
+      exec("docker", "ps", *filter_options, *args)
     end
 
     private

data/lib/penkit/docker/pull.rb

@@ -0,0 +1,11 @@
+module Penkit
+  class Docker
+    def pull(image, options={})
+      if options[:quiet]
+        system("docker", "pull", image_url(image), out: File::NULL, err: File::NULL)
+      else
+        system("docker", "pull", image_url(image))
+      end
+    end
+  end
+end

data/lib/penkit/version.rb

@@ -1,3 +1,3 @@
 module Penkit
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penkit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Don Humphreys
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -65,10 +65,12 @@ files:
 - LICENSE
 - TERMS
 - bin/penkit
+- config/php.yml
 - config/wordpress.yml
 - lib/penkit.rb
 - lib/penkit/cli.rb
 - lib/penkit/cli/container/ps.rb
+- lib/penkit/cli/container/pull.rb
 - lib/penkit/cli/container/rm.rb
 - lib/penkit/cli/container/start.rb
 - lib/penkit/cli/container/stop.rb
@@ -77,6 +79,7 @@ files:
 - lib/penkit/docker.rb
 - lib/penkit/docker/network.rb
 - lib/penkit/docker/ps.rb
+- lib/penkit/docker/pull.rb
 - lib/penkit/docker/rm.rb
 - lib/penkit/docker/start.rb
 - lib/penkit/docker/stop.rb