dory 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e825ef0b9801162ae6e85917f8a96a85414fdee0d0cb95cb2294cf3713a9a928
-  data.tar.gz: 0eac1cbed1386870476f2a30fc9ad555d6e012ac9578e1ab07dacfcef473b33c
+  metadata.gz: fb28a336f3e54a040327c42f065870e7607e8fb57d00a2778f99451b5ce261f4
+  data.tar.gz: 6cc76d4eb6616392daad1fff9122371d16d4cdc23dac3449d42f33f0106f8a4d
 SHA512:
-  metadata.gz: 4519893556ea02cb143ceb3b8be8dbb3403fad1ca821fb0a4a39858bc90d36f7379fe10495c8126bb0cad0b98ce415451bfa4adc79157bb6c62dc615ad8b6fbd
-  data.tar.gz: 9b2818b926f77feb39571c89913089cb77b29c6b789631d8342cfa6d57484ed1fe9935a8e783df6c8a48f28544a4f249021f2a9dff15d93073f59c2f2672e53e
+  metadata.gz: f0e192446e0730bfddfc2304b684b297afa81e6356902ba0ffa2ec77f2dd1fd352cf9cde9f47ad6bd26ef7a315f547ea933b8d6f5ef7a6f1cc8bef96f4d2b33e
+  data.tar.gz: d3289c42819a80fd4d0d2d99acccc43cd55e6a21ae79dbfbacbd41ab242692b6b451444e1b5c3de91d0c161807cc9a176fbbcef73b876f92495a6438df00bdaa

data/lib/dory/config.rb

@@ -57,6 +57,8 @@ module Dory
             container_name: dory_dinghy_http_proxy
             https_enabled: true
             ssl_certs_dir: ''  # leave as empty string to use default certs
+            port: 80           # port 80 is default for http
+            tls_port: 443      # port 443 is default for https
           resolv:
             enabled: true
             nameserver: 127.0.0.1
@@ -122,6 +124,14 @@ module Dory
         newsettings[:dory][:dnsmasq][:service_start_delay] = 5
       end
 
+      # add settings for nginx proxy port
+      unless newsettings[:dory][:nginx_proxy][:port]
+        newsettings[:dory][:nginx_proxy][:port] = 80
+      end
+      unless newsettings[:dory][:nginx_proxy][:tls_port]
+        newsettings[:dory][:nginx_proxy][:tls_port] = 443
+      end
+
       newsettings
     end
   end

data/lib/dory/proxy.rb

@@ -32,14 +32,18 @@ module Dory
       if [:tls_enabled, :ssl_enabled, :https_enabled].any? { |s|
           Dory::Config.settings[:dory][:nginx_proxy][s]
          }
-        "-p 443:443"
+        "-p #{Dory::Config.settings[:dory][:nginx_proxy][:tls_port]}:443"
       else
         ''
       end
     end
 
+    def self.http_port
+      Dory::Config.settings[:dory][:nginx_proxy][:port]
+    end
+
     def self.run_command
-      "docker run -d -p 80:80 #{self.tls_arg} #{self.certs_arg} "\
+      "docker run -d -p #{http_port}:80 #{self.tls_arg} #{self.certs_arg} "\
         "-v /var/run/docker.sock:/tmp/docker.sock -e " \
         "'CONTAINER_NAME=#{Shellwords.escape(self.container_name)}' --name " \
         "'#{Shellwords.escape(self.container_name)}' " \

data/lib/dory/version.rb

@@ -1,9 +1,9 @@
 module Dory
   def self.version
-    '1.0.4'
+    '1.1.0'
   end
 
   def self.date
-    '2019-04-16'
+    '2019-08-13'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dory
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize