Skip to content

Commit ce42ae2

Browse files
committed
update
1 parent 01a41a7 commit ce42ae2

File tree

8 files changed

+32
-22
lines changed

8 files changed

+32
-22
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
dry-stack (0.1.44)
4+
dry-stack (0.1.45)
55

66
GEM
77
remote: https://rubygems.org/

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This gem allows ...
66
cat simple_stack.drs | dry-stack -e to_compose | docker stack deploy -c - simple_stack
77
88
$ dry-stack
9-
Version: 0.1.44
9+
Version: 0.1.45
1010
Usage:
1111
dry-stack -s stackfile [options] COMMAND
1212
cat stackfile | dry-stack COMMAND

lib/dry-stack/stack.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def to_compose(opts = @options)
218218

219219
if opts[:traefik_tls]
220220
domain = opts[:tls_domain] || 'example.com'
221-
domain = ing[:host].gsub('.*', ".#{domain}") if ing[:host]&.include?('*')
221+
domain = ing[:host].gsub('.*', ".#{domain}") if ing[:host]&.include?('.*')
222222
domain = ing[:tls_domain] if ing[:tls_domain]
223223
service[:deploy][:labels] += [
224224
"traefik.http.routers.#{service_name}-#{index}.tls=true",

lib/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Dry
22
class Stack
3-
VERSION = '0.1.44'
3+
VERSION = '0.1.45'
44
end
55
end

spec/data/stack1-compose.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -153,22 +153,6 @@ services:
153153
target: "/dev/shm"
154154
tmpfs:
155155
size: 4096000000
156-
front:
157-
environment:
158-
STACK_NAME: simple_stack
159-
STACK_SERVICE_NAME: front
160-
deploy:
161-
labels:
162-
- stack.product=product A
163-
- traefik.enable=true
164-
- traefik.http.routers.simple_stack_front-0.service=simple_stack_front-0
165-
- traefik.http.services.simple_stack_front-0.loadbalancer.server.port=7000
166-
- traefik.http.routers.simple_stack_front-0.rule=HostRegexp(`{name:.*}`)
167-
networks:
168-
default:
169-
ingress_routing:
170-
init: true
171-
image: reports:0.1
172156
networks:
173157
default:
174158
attachable: true

spec/data/stack1.drs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,4 @@ Service :reports2, image: 'reports:0.1', env: {DB_URL: '$DB_URL'}, ports: 7000 d
4949
volume source: nil, type: 'tmpfs', target: '/dev/shm', tmpfs: { size: 4096000000 }
5050
end
5151

52-
Service :front, image: 'reports:0.1', ports: 7000, ingress: { host: '*' }
53-
5452
Network :default, attachable: true

spec/data/stack18-compose.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
version: '3.8'
3+
services:
4+
front:
5+
environment:
6+
STACK_NAME: stack
7+
STACK_SERVICE_NAME: front
8+
deploy:
9+
labels:
10+
- traefik.enable=true
11+
- traefik.http.routers.stack_front-0.service=stack_front-0
12+
- traefik.http.services.stack_front-0.loadbalancer.server.port=7000
13+
- traefik.http.routers.stack_front-0.tls=true
14+
- traefik.http.routers.stack_front-0.tls.certresolver=le
15+
- traefik.http.routers.stack_front-0.tls.domains[0].main=my.com
16+
- traefik.http.routers.stack_front-0.rule=HostRegexp(`{name:.*}`)
17+
networks:
18+
default:
19+
ingress_routing:
20+
init: true
21+
image: reports:0.1
22+
networks:
23+
ingress_routing:
24+
external: true
25+
name: ingress-routing

spec/data/stack18.drs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Options traefik_tls: true, tls_domain: 'my.com', ingress: true
2+
3+
Service :front, image: 'reports:0.1', ports: 7000, ingress: { host: '*' }

0 commit comments

Comments
 (0)