dip 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ceb8c2f3312fdbc11a07bb73df3bb6c1a7a5bffbbab5b8adfd9a40585acb463
-  data.tar.gz: 2f34aae2a69df0f8356245558f996f37ae459c72bd00136b39bd6bce63fc3977
+  metadata.gz: de28bb80ddff1548082c5b8ccd0115bcd650cbdba9a930c666b02751cf0ba976
+  data.tar.gz: 96a4a6d5b2f78b559ef429f793e1899ec8d35edc7f10ac90693632b8a9e2be06
 SHA512:
-  metadata.gz: acd4d9ac91aadf4ea842350a3bcd2cf18c6ef05c55c6a659f2f32a822b03fa0effbde00e163ad8de9dc98e24dd5d0329320eb79f03b6b109cc6b318d07b1b928
-  data.tar.gz: 3f0933d9bd9c482b733bb5672fd23b0def1fbfe6484166f759a017b6fc6beb5e20554b6de54a46009da8856894fbfbd0376cde2e3103426290205bcfe540965e
+  metadata.gz: 404af36fd19249124ab8bf8ce3f765c03f8e72ef9d6c1138424704233caf543c7ce2cf8ea7a86ece144407597bfba895cdb140ef277aa71042201a77221c974c
+  data.tar.gz: 4b788801e5c6e73e259f0de5b4c137aa5dcce5a7e681dae1d21b2c403118cdafdf0870c22bd80be350c25f943e100930c0f8296927898196e0c812e0f1f66254

data/README.md

@@ -8,10 +8,15 @@ Docker Interaction Process
 
 A command-line utility that gives the "native" interaction with applications configured with Docker Compose. It is for local development only. In practice, it creates the feeling that you work without containers.
 
+<p float="left">
+<a href="https://evilmartians.com/?utm_source=dip"><img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" height="80" /></a>
+<img src="https://ya-webdesign.com/images250_/vertical-divider-png-1.png" width="50" height="100" />
+<a href="https://www.jetbrains.com/?from=DIP"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/1/1a/JetBrains_Logo_2016.svg/1200px-JetBrains_Logo_2016.svg.png" alt="Sponsored by JetBrains" height="100" /></a></p>
+
 ## Presentations and examples
 
 - [Local development with Docker containers](https://slides.com/bibendi/dip)
-- [Dockerized Ruby on Rails application](https://github.com/bibendi/dip-example-rails)
+- Dockerized Ruby on Rails applications: [one](https://github.com/bibendi/dip-example-rails), [two](https://github.com/evilmartians/evil_chat)
 - [Dockerized Node.js application](https://github.com/bibendi/yt-graphql-react-event-booking-api)
 - [Dockerized Ruby gem](https://github.com/bibendi/schked)
 
@@ -39,11 +44,11 @@ When we change the current directory, all shell aliases will be automatically re
 
 Also, in shell mode Dip is trying to determine manually passed environment variables. For example:
 
-```sh
+```shhttps://ya-webdesign.com/images250_/vertical-divider-png-1.pnghttps://ya-webdesign.com/images250_/vertical-divider-png-1.png
 VERSION=20180515103400 rails db:migrate:down
 ```
 
-You could add this `eval` at the end of your `~/.zshrc`, or `~/.bashrc`, or `~/.bash_profile`. 
+You could add this `eval` at the end of your `~/.zshrc`, or `~/.bashrc`, or `~/.bash_profile`.
 After that, it will be automatically applied when you open your preferred terminal.
 
 ## Installation
@@ -70,14 +75,14 @@ gem install dip
 
 ### Precompiled binary
 
-If you don't have installed Ruby, then you could copy a precompiled binary to your system. 
+If you don't have installed Ruby, then you could copy a precompiled binary to your system.
 It can be found at [releases page](https://github.com/bibendi/dip/releases)
 or type bellow into your terminal:
 
 ```sh
-curl -L https://github.com/bibendi/dip/releases/download/4.1.0/dip-`uname -s`-`uname -m` > /usr/local/bin/dip
+curl -L https://github.com/bibendi/dip/releases/download/4.2.0/dip-`uname -s`-`uname -m` > /usr/local/bin/dip
 chmod +x /usr/local/bin/dip
-``` 
+```
 
 ## Docker installation
 
@@ -97,13 +102,13 @@ The configuration file `dip.yml` should be placed in a project root directory.
 Also, in some cases, you may want to change the default config path by providing an environment variable `DIP_FILE`.
 If nearby places `dip.override.yml` file it would be merged into the main config.
 
-Below is an example of a real config. 
-`dip.yml` reference will be written soon. 
+Below is an example of a real config.
+`dip.yml` reference will be written soon.
 Also, you can check out examples in the top.
 
 ```yml
 # Required minimum dip version
-version: '4'
+version: '4.1'
 
 environment:
   COMPOSE_EXT: development
@@ -293,6 +298,20 @@ curl www.bar-app.docker/api/v1/quz
 curl www.bar-app.docker/api/v1/baz_service/qzz
 ```
 
+#### Pass SSL certificates
+
+```sh
+dip nginx up -c $HOME/ssl_certificates
+```
+
+#### Publish more than one port to localhost
+
+Just pass a list, separated by a space:
+
+```sh
+dip nginx up -p 80:80 443:443
+```
+
 ### dip dns
 
 Runs a DNS server container based on https://github.com/aacebedo/dnsdock. It is used for container to container requests through Nginx. An application's docker-compose.yml should define `dns` configuration with environment variable `$DIP_DNS` and connect to external network `frontend`. `$DIP_DNS` will be automatically assigned by dip.

data/lib/dip/cli/nginx.rb

@@ -16,12 +16,13 @@ module Dip
                              desc: 'Path to docker socket'
       method_option :net, aliases: '-t', type: :string, default: "frontend",
                           desc: 'Container network name'
-      method_option :publish, aliases: '-p', type: :string, default: "80:80",
-                              desc: 'Container port'
+      method_option :publish, aliases: '-p', type: :array, default: "80:80",
+                              desc: 'Container port(s). For more than one port, separate them by a space'
       method_option :image, aliases: '-i', type: :string, default: "bibendi/nginx-proxy:latest",
                             desc: 'Docker image name'
       method_option :domain, aliases: '-d', type: :string, default: "docker",
                              desc: 'Top level domain'
+      method_option :certs, aliases: '-c', type: :string, desc: 'Path to ssl certificates'
       def up
         if options[:help]
           invoke :help, ['up']
@@ -32,7 +33,8 @@ module Dip
             net: options.fetch(:net),
             publish: options.fetch(:publish),
             image: options.fetch(:image),
-            domain: options.fetch(:domain)
+            domain: options.fetch(:domain),
+            certs: options[:certs]
           ).execute
         end
       end

data/lib/dip/commands/nginx.rb

@@ -7,13 +7,14 @@ module Dip
   module Commands
     module Nginx
       class Up < Dip::Command
-        def initialize(name:, socket:, net:, publish:, image:, domain:)
+        def initialize(name:, socket:, net:, publish:, image:, domain:, certs:)
           @name = name
           @socket = socket
           @net = net
           @publish = publish
           @image = image
           @domain = domain
+          @certs = certs
         end
 
         def execute
@@ -26,8 +27,9 @@ module Dip
         def container_args
           result = %w(--detach)
           result << "--volume #{@socket}:/tmp/docker.sock:ro"
+          result << "--volume #{@certs}:/etc/nginx/certs" unless @certs.to_s.empty?
           result << "--restart always"
-          result << "--publish #{@publish}"
+          result << Array(@publish).map { |p| "--publish #{p}" }.join(' ')
           result << "--net #{@net}"
           result << "--name #{@name}"
           result << "--label com.dnsdock.alias=#{@domain}"

data/lib/dip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dip
-  VERSION = "4.1.0"
+  VERSION = "4.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dip
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - bibendi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor