minke 1.9.6 → 1.9.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +8 -8
- data/Gemfile +1 -1
- data/docker/Dockerfile +2 -4
- data/docker/Gemfile +1 -0
- data/lib/minke/docker/service_discovery.rb +1 -1
- data/lib/minke/tasks/task.rb +0 -6
- data/lib/minke/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
ZmE2OGE0OGIwNzIxOGFmOGJhNDZkMzI3NGY2M2I4YjA0ZjNjZjE0YQ==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
Y2I5NjY2YmQxYzEwZmRlNmJiYmU4YTdmMDllNzEzOWY2YWRlNTk5OQ==
|
|
7
7
|
SHA512:
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
Y2ZmYjMwNjliYWM0MDViOWNiZGI2NTg4NzhjNWM0N2JhM2FlOWVmOWExNjQy
|
|
10
|
+
ZDY2OTYxNjRhYmFkZWMzNTkzMjM0ZjEzNDg5N2QzMzNjMmU4OWQ2OWM1NjA5
|
|
11
|
+
YjIwYjhlMDQ0OGRlZmQ0ZDc0MTI0ZDdkM2E2ZjVkNzMyZTFjZWU=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
OTYxNzE2YTJlNjA1ZWQyMWE4NDQyMzViZTQ2YzMyNmYyOTc2N2NkYjU4Mjdm
|
|
14
|
+
Yzg2MjE5ZDg2ZWM0ZjJmOTU4OTcxYmE2Y2RlYzhlZmYzYzhiNDQzODY3N2Vk
|
|
15
|
+
NDg3Mzc5MTQ0MzUyNGQ4NWY4NjhkMDA3ZTdkNTQ5MTI4YThjZWU=
|
data/Gemfile
CHANGED
|
@@ -6,4 +6,4 @@ gemspec
|
|
|
6
6
|
gem "codeclimate-test-reporter", group: :test, require: nil
|
|
7
7
|
#gem 'minke-generator-go', :path => '/Users/nicj/Developer/gems/minke-generator-go'
|
|
8
8
|
#gem 'minke-generator-node', :path => '/Users/nicj/Developer/gems/minke-generator-node'
|
|
9
|
-
#gem 'minke-generator-spring', :
|
|
9
|
+
#gem 'minke-generator-spring', :path => '/Users/nicj/Developer/gems/minke-generator-spring'
|
data/docker/Dockerfile
CHANGED
|
@@ -4,13 +4,11 @@ ENV COMPOSE_VERSION 1.7.1
|
|
|
4
4
|
ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
|
5
5
|
|
|
6
6
|
RUN apt-get update
|
|
7
|
-
RUN apt-get -y install procps build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev
|
|
7
|
+
RUN apt-get -y install procps build-essential openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev automake libtool bison rubygems ca-certificates
|
|
8
8
|
|
|
9
9
|
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 && curl -L get.rvm.io | bash -s stable --ruby=2.3.1 --with-gems="bundle"
|
|
10
10
|
|
|
11
|
-
RUN
|
|
12
|
-
&& apt-get install -y -q --no-install-recommends curl ca-certificates \
|
|
13
|
-
&& curl -o /usr/local/bin/docker-compose -L \
|
|
11
|
+
RUN curl -o /usr/local/bin/docker-compose -L \
|
|
14
12
|
"https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-Linux-x86_64" \
|
|
15
13
|
&& chmod +x /usr/local/bin/docker-compose
|
|
16
14
|
|
data/docker/Gemfile
CHANGED
|
@@ -20,7 +20,7 @@ module Minke
|
|
|
20
20
|
begin
|
|
21
21
|
ip = @docker_runner.get_docker_ip_address
|
|
22
22
|
container_details = find_container_by_name "/#{@project_name}_#{service_name}_1"
|
|
23
|
-
ports = container_details.first.info['Ports'].select { |p| p['PrivatePort'] == private_port }.first
|
|
23
|
+
ports = container_details.first.info['Ports'].select { |p| p['PrivatePort'] == private_port.to_i }.first
|
|
24
24
|
rescue
|
|
25
25
|
raise "Unable to find public address for '#{service_name}' on port #{private_port}"
|
|
26
26
|
end
|
data/lib/minke/tasks/task.rb
CHANGED
|
@@ -93,12 +93,6 @@ module Minke
|
|
|
93
93
|
elsif url.type == 'public'
|
|
94
94
|
address = @service_discovery.public_address_for url.address, url.port
|
|
95
95
|
|
|
96
|
-
# if running on docker for mac we need to replace the ip address with the docker hosts
|
|
97
|
-
ip = @docker_runner.get_docker_ip_address
|
|
98
|
-
if ip != "127.0.0.1" && ip != "0.0.0.0" && ip != nil
|
|
99
|
-
address.gsub!('0.0.0.0', ip)
|
|
100
|
-
end
|
|
101
|
-
|
|
102
96
|
"#{url.protocol}://#{address}#{url.path}"
|
|
103
97
|
end
|
|
104
98
|
end
|
data/lib/minke/version.rb
CHANGED