Skip to content

Commit

Permalink
added docker/logs function
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlangch
jlangch committed Sep 1, 2023
1 parent 81b0be2 commit b14a7e8
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 21 deletions.
1 change: 1 addition & 0 deletions ...in/java/com/github/jlangch/venice/impl/docgen/cheatsheet/modules/ModuleDockerSection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public DocSection section() {
containers.addItem(diBuilder.getDocItem("docker/pause", false));
containers.addItem(diBuilder.getDocItem("docker/unpause", false));
containers.addItem(diBuilder.getDocItem("docker/wait", false));
containers.addItem(diBuilder.getDocItem("docker/logs", false));

final DocSection volume = new DocSection("Volumes", id());
all.addSection(volume);
Expand Down
87 changes: 66 additions & 21 deletions src/main/resources/com/github/jlangch/venice/docker.venice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
;; - docker/pause
;; - docker/unpause
;; - docker/cp
;; - docker/volume-list
;; - docker/logs
;; -----------------------------------------------------------------------------

(defn
Expand Down Expand Up @@ -344,13 +344,12 @@
:args ["--database.auto-upgrade"])
""" )
:see-also '(
"docker/images"
"docker/ps"
"docker/start" "docker/stop"
"docker/rm" "docker/prune"
"docker/exec" "docker/cp" "docker/diff"
"docker/pause" "docker/unpause"
"docker/cp"
"docker/images" "docker/ps"
"docker/start" "docker/stop"
"docker/rm" "docker/prune"
"docker/exec" "docker/cp" "docker/diff"
"docker/pause" "docker/unpause"
"docker/cp" "docker/logs"
"docker/container-find-by-name"
"docker/container-exists-with-name?"
"docker/container-running-with-name?"
Expand Down Expand Up @@ -449,7 +448,9 @@
| :attach {true, false} | Attach STDOUT/STDERR and forward signals |
"""
:examples '(
"""(docker/start "b19b498c670b")""" )
"""
(docker/start "74789744g489")
""" )
:see-also '(
"docker/stop"
"docker/ps"
Expand Down Expand Up @@ -477,7 +478,7 @@
"""
:examples '(
"""
(docker/stop "b19b498c670b" :time 30)
(docker/stop "74789744g489" :time 30)
""" )
:see-also '(
"docker/start"
Expand Down Expand Up @@ -507,7 +508,7 @@
"""
:examples '(
"""
(docker/exec mycontainer "touch /tmp/execWorks")
(docker/exec "74789744g489" "touch /tmp/execWorks")
""" )
:see-also '(
"docker/ps"
Expand All @@ -532,7 +533,7 @@
"""
:examples '(
"""
(docker/rm "b19b498c670b")
(docker/rm "74789744g489")
""" )
:see-also '(
"docker/prune"
Expand Down Expand Up @@ -587,19 +588,19 @@
:examples '(
"""
;; Copy file from host to docker container
(docker/cp data.txt 74789744g489:/data.txt)
(docker/cp "data.txt" "74789744g489:/data.txt")
""",
"""
;; Copy file from docker container to host
(docker/cp 74789744g489:/data.txt data.txt)
(docker/cp "74789744g489:/data.txt" "data.txt")
""",
"""
;; Copy a folder from host to docker container
(docker/cp Desktop/images 74789744g489:/root/img_files/car_photos/images
(docker/cp "Desktop/images" "74789744g489:/root/img_files/car_photos/images")
""",
"""
;; Copy a folder from docker container to host
(docker/cp 74789744g489:/root/img_files/car_photos/images Desktop/images
(docker/cp "74789744g489:/root/img_files/car_photos/images Desktop/images")
""" )
:see-also '(
"docker/diff"
Expand Down Expand Up @@ -631,10 +632,10 @@
"""
:examples '(
"""
(println (docker/diff 74789744g489))
(println (docker/diff "74789744g489"))
""",
"""
(docker/diff 74789744g489 :format :json)
(docker/diff "74789744g4892" :format :json)
""" )
:see-also '(
"docker/cp"
Expand Down Expand Up @@ -662,7 +663,7 @@
"""
:examples '(
"""
(docker/pause 74789744g489)
(docker/pause "74789744g489")
""" )
:see-also '(
"docker/unpause"
Expand All @@ -682,7 +683,7 @@
"""
:examples '(
"""
(docker/unpause 74789744g489)
(docker/unpause "74789744g489")
""" )
:see-also '(
"docker/pause"
Expand All @@ -702,7 +703,7 @@
"""
:examples '(
"""
(docker/wait 74789744g489)
(docker/wait "74789744g4892")
""" )
:see-also '(
"docker/ps"
Expand All @@ -715,6 +716,47 @@
(:out (apply docker/cmd cmdargs*))))


(defn
^{ :arglists '("(docker/logs container & options)")
:doc """
Get the logs of a container

Options:

| :tail n | Number of lines to show from the end of the logs |
| :since ts | Show logs since timestamp |
| :until ts | Show logs until timestamp |
"""
:examples '(
"""
(docker/logs "74789744g489")
""",
"""
(docker/logs "74789744g489" :tail 100)
""",
"""
(let [since (time/minus (time/local-date-time) :hours 2)
until (time/local-date-time)]
(docker/logs "74789744g489" :since since :until until))
""")
:see-also '(
"docker/pause"
"docker/ps"
"docker/run" ) }

logs [container & options]

(let [opts (apply hash-map options)
tail (:tail opts nil)
since (:since opts nil)
until (:until opts nil)
cmdargs* ["logs"]
cmdargs* (if (some? tail) (into cmdargs* ["--tail" tail]) cmdargs*)
cmdargs* (if (some? since) (into cmdargs* ["--since" (format-ts since)]) cmdargs*)
cmdargs* (if (some? until) (into cmdargs* ["--until" (format-ts until)]) cmdargs*)
cmdargs* (into cmdargs* [container])]
(:out (apply docker/cmd cmdargs*))))


;; -----------------------------------------------------------------------------
;; Volume functions
Expand Down Expand Up @@ -1092,6 +1134,9 @@
(json/read-str $))
output))

(defn- format-ts [ts]
(assert (time/local-date-time? ts))
(time/format ts "yyyy-MM-dd'T'HH:mm:ss'Z'"))

(defn- os-exec []
(case (os-type)
Expand Down

0 comments on commit b14a7e8

Please sign in to comment.