moby-derp 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 443db141ccca9522f7fe188a5fb5b0ed972197eb4de18e899ad275adaf16689c
-  data.tar.gz: 75c10f4b97000efccd2ba4f0bda78b8a5fa44a77c6e1e37262a8744324242b88
+  metadata.gz: 31c2c89cac1b196c48dc2c2183367d61578b1e4e1bae1ff7d698dd7ef6c23cb5
+  data.tar.gz: c7b83663a971a01f3e8b5e8a5420b12b6192d207107ce1cd3047539644051f3e
 SHA512:
-  metadata.gz: f75ffe9184bdcc0949ee6030b04927e7821c4bfa4a9a7d3ede99947f24f05580d58e28edd9efc253fa420c733a1d64e8a3cc85bc3df900e6479d9de35a8c39f6
-  data.tar.gz: dcc3c3a0ac2ed25d321b15118a876f3b40288ba028736324ee61b5783615da74d941532c000fd01795ecdf316e8c56a95b5a18332dd9a9e1c180224b87eeba4a
+  metadata.gz: 34c40eb8d1d8cfa668a3048c6a8ceaf231c4fae6a607d389bf073d3a3874a74a10a31e728c0c322476a154c9c425fd92869d0fb5849707c1dee2b4c0970f15af
+  data.tar.gz: 01d15f3f197b48fe5748f27718a8e8c7035ff0713113742bf1ae7a43a480197ab7a97559e4ae19fbec8ca5711d22ebd38f02865194e9ce73a817b11a0899bf9a

data/lib/moby_derp/container.rb

@@ -71,6 +71,7 @@ module MobyDerp
 							}
 						}
 					end
+					params["ExposedPorts"] = Hash[@pod.expose.map { |ex| [ex, {}] }]
 				else
 					params["HostConfig"] = {
 						"NetworkMode"   => "container:#{@pod.root_container_id}",

data/lib/moby_derp/container_config.rb

@@ -3,6 +3,7 @@ require_relative "./error"
 require_relative "./mount"
 
 require "docker-api"
+require "shellwords"
 
 module MobyDerp
 	class ContainerConfig
@@ -66,7 +67,10 @@ module MobyDerp
 		def validate_command
 			case @command
 			when String
-				true
+				# Despite the Docker Engine API spec saying you can pass a string,
+				# if you do it doesn't get parsed into arguments... so that's pretty
+				# fucking useless.
+				@command = Shellwords.split(@command)
 			when Array
 				unless @command.all? { |c| String === c }
 					raise ConfigurationError, "all elements of the command array must be strings"

data/lib/moby_derp/pod.rb

@@ -68,6 +68,10 @@ module MobyDerp
 			@config.hostname
 		end
 
+		def expose
+			@config.expose
+		end
+
 		private
 
 		def root_container

data/lib/moby_derp/pod_config.rb

@@ -21,8 +21,8 @@ module MobyDerp
 		            :publish,
 		            :publish_all,
 		            :mount_root,
-						:system_config,
-						:logger
+		            :system_config,
+		            :logger
 
 		def initialize(filename, system_config)
 			@logger = system_config.logger
@@ -181,18 +181,23 @@ module MobyDerp
 				      "expose must be an array"
 			end
 
-			@expose.map!(&:to_s)
-
-			@expose.each do |e|
+			@expose.map! do |e|
+				e = e.to_s
 				unless e.is_a?(String) && e =~ %r{\A\d+(/(tcp|udp))?\z}
 					raise ConfigurationError,
 					      "exposed ports must be integers, with an optional protocol specifier (got #{e.inspect})"
 				end
 
+				if $1.nil?
+					e += "/tcp"
+				end
+
 				if e.to_i < 1 || e.to_i > 65535
 					raise ConfigurationError,
 					      "exposed port #{e} is out of range (expected 1-65535)"
 				end
+
+				e
 			end
 		end
 

data/smoke_tests/exposed.bats

@@ -0,0 +1,28 @@
+load test_helper
+
+@test "Exposed ports" {
+	config_file <<-'EOF'
+		expose:
+		  - 80
+		  - "53/udp"
+		containers:
+		  bob:
+		    image: busybox:latest
+		    command: sleep 600
+		common_labels:
+		  moby-derp-smoke-test: ayup
+EOF
+
+	run $MOBY_DERP_BIN $TEST_CONFIG_FILE
+
+	echo "status: $status"
+	echo "output: $output"
+
+	[ "$status" = "0" ]
+	container_running "mdst"
+	container_running "mdst.bob"
+
+	docker inspect mdst --format='{{.Config.ExposedPorts}}'
+	docker inspect mdst --format='{{.Config.ExposedPorts}}' | grep 'map.*53/udp:{}'
+	docker inspect mdst --format='{{.Config.ExposedPorts}}' | grep 'map.*80/tcp:{}'
+}

data/smoke_tests/test_helper.bash

@@ -23,7 +23,7 @@ EOF
 teardown() {
 	for i in $(docker ps -a --format='{{.Names}}'); do
 		if docker container inspect $i --format='{{.Config.Labels}}' | grep -q moby-derp-smoke-test; then
-			docker rm -f $i
+			docker rm -f $i >/dev/null
 		fi
 	done
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moby-derp
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-04 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -220,6 +220,7 @@ files:
 - lib/moby_derp/pod_config.rb
 - lib/moby_derp/system_config.rb
 - moby-derp.gemspec
+- smoke_tests/exposed.bats
 - smoke_tests/minimal.bats
 - smoke_tests/no_file.bats
 - smoke_tests/test_helper.bash