Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix byte-comp error with vterm #223

Merged
merged 1 commit into from
Sep 10, 2023
Merged

Fix byte-comp error with vterm #223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions docker-container.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,20 +251,20 @@ nil, ask the user for it."
default directory set to workdir."
(interactive (list
(docker-container-read-name)))
(if (fboundp 'vterm-other-window)
(let* ((container-address (format "docker:%s:" container))
(file-prefix (let ((prefix (file-remote-p default-directory)))
(if prefix
(format "%s|" (s-chop-suffix ":" prefix))
"/")))
(container-config (cdr (assq 'Config (aref (json-read-from-string (aio-await (docker-run-docker-async "inspect" container))) 0))))
(container-workdir (cdr (assq 'WorkingDir container-config)))
(container-env (cdr (assq 'Env container-config)))
(default-directory (format "%s%s%s" file-prefix container-address container-workdir))
;; process-environment doesn't work with tramp if you call this function more than one per emacs session
(tramp-remote-process-environment (append container-env nil)))
(vterm-other-window (docker-utils-generate-new-buffer-name "docker" "vterm-env:" default-directory)))
(error "The vterm package is not installed")))
(let* ((container-address (format "docker:%s:" container))
(file-prefix (let ((prefix (file-remote-p default-directory)))
(if prefix
(format "%s|" (s-chop-suffix ":" prefix))
"/")))
(container-config (cdr (assq 'Config (aref (json-read-from-string (aio-await (docker-run-docker-async "inspect" container))) 0))))
(container-workdir (cdr (assq 'WorkingDir container-config)))
(container-env (cdr (assq 'Env container-config)))
(default-directory (format "%s%s%s" file-prefix container-address container-workdir))
;; process-environment doesn't work with tramp if you call this function more than one per emacs session
(tramp-remote-process-environment (append container-env nil)))
(if (fboundp 'vterm-other-window)
(vterm-other-window (docker-utils-generate-new-buffer-name "docker" "vterm-env:" default-directory))
(error "The vterm package is not installed"))))

(defun docker-container-cp-from-selection (container-path host-path)
"Run \"docker cp\" from CONTAINER-PATH to HOST-PATH for selected container."
Expand Down