Skip to content

Commit 838eaf4

Browse files
committed
Support docker volumes in project sub-directory.
1 parent 23faf61 commit 838eaf4

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pythonic.el

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ print(json.dumps(yaml.safe_load(open(sys.argv[-1], 'r'))))
177177
(let (volumes)
178178
(dolist (service (cdr (assoc "services" struct)))
179179
(dolist (volume (cdr (assoc "volumes" service)))
180-
(when (s-starts-with-p ".:" volume)
181-
(push (cons (car service) (s-chop-prefix ".:" volume)) volumes))))
180+
(when (s-starts-with-p "." volume)
181+
(push (cons (car service) (s-split ":" volume)) volumes))))
182182
volumes))
183183

184184
(defun pythonic-get-docker-compose-container (filename service)
@@ -206,11 +206,12 @@ print(json.dumps(yaml.safe_load(open(sys.argv[-1], 'r'))))
206206
(assoc (completing-read "Service: " (mapcar 'car volumes) nil t) volumes)
207207
(car volumes)))
208208
(service (car volume))
209-
(mount (cdr volume))
209+
(sub-project (f-join project (cadr volume)))
210+
(mount (caddr volume))
210211
(container (pythonic-get-docker-compose-container filename service))
211212
;; FIXME: Get actual user for the connection string.
212213
(connection (format "/docker:root@%s:%s" container mount))
213-
(alias (list project connection)))
214+
(alias (list sub-project connection)))
214215
(unless (s-blank-p container)
215216
(push alias pythonic-directory-aliases))
216217
alias)))))

0 commit comments

Comments
 (0)