Skip to content

Commit 48f9709

Browse files
committed
Introduce some more type information.
1 parent 903b4f2 commit 48f9709

File tree

2 files changed

+23
-22
lines changed

2 files changed

+23
-22
lines changed

client/src/main/groovy/de/gesellix/docker/client/image/ManageImage.groovy

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package de.gesellix.docker.client.image
22

33
import de.gesellix.docker.client.DockerAsyncCallback
44
import de.gesellix.docker.client.Timeout
5+
import de.gesellix.docker.engine.EngineResponse
56

67
interface ManageImage {
78

@@ -21,7 +22,7 @@ interface ManageImage {
2122

2223
// history Show the history of an image
2324

24-
def history(image)
25+
EngineResponse history(image)
2526

2627
// import Import the contents from a tarball to create a filesystem image
2728

@@ -39,23 +40,23 @@ interface ManageImage {
3940

4041
// inspect Display detailed information on one or more images
4142

42-
def inspectImage(image)
43+
EngineResponse inspectImage(image)
4344

4445
// load Load an image from a tar archive or STDIN
4546

46-
def load(stream)
47+
EngineResponse load(stream)
4748

4849
// ls List images
4950

50-
def images()
51+
EngineResponse images()
5152

52-
def images(query)
53+
EngineResponse images(query)
5354

5455
// prune Remove unused images
5556

56-
def pruneImages()
57+
EngineResponse pruneImages()
5758

58-
def pruneImages(query)
59+
EngineResponse pruneImages(query)
5960

6061
// pull Pull an image or a repository from a registry
6162

@@ -69,21 +70,21 @@ interface ManageImage {
6970

7071
// push Push an image or a repository to a registry
7172

72-
def push(image)
73+
EngineResponse push(String image)
7374

74-
def push(image, authBase64Encoded)
75+
EngineResponse push(String image, String authBase64Encoded)
7576

76-
def push(image, authBase64Encoded, registry)
77+
EngineResponse push(String image, String authBase64Encoded, String registry)
7778

7879
// rm Remove one or more images
7980

80-
def rmi(image)
81+
EngineResponse rmi(image)
8182

8283
// save Save one or more images to a tar archive (streamed to STDOUT by default)
8384

84-
def save(... images)
85+
EngineResponse save(... images)
8586

8687
// tag Create a tag TARGET_IMAGE that refers to SOURCE_IMAGE
8788

88-
def tag(image, repository)
89+
EngineResponse tag(image, repository)
8990
}

client/src/main/groovy/de/gesellix/docker/client/image/ManageImageClient.groovy

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class ManageImageClient implements ManageImage {
108108
}
109109

110110
@Override
111-
history(imageId) {
111+
EngineResponse history(imageId) {
112112
log.info "docker history"
113113
def response = client.get([path: "/images/${imageId}/history"])
114114
return response
@@ -145,14 +145,14 @@ class ManageImageClient implements ManageImage {
145145
}
146146

147147
@Override
148-
inspectImage(imageId) {
148+
EngineResponse inspectImage(imageId) {
149149
log.info "docker inspect image"
150150
def response = client.get([path: "/images/${imageId}/json"])
151151
return response
152152
}
153153

154154
@Override
155-
load(stream) {
155+
EngineResponse load(stream) {
156156
log.info "docker load"
157157

158158
def response = client.post([path : "/images/load",
@@ -164,7 +164,7 @@ class ManageImageClient implements ManageImage {
164164
}
165165

166166
@Override
167-
images(query = [:]) {
167+
EngineResponse images(query = [:]) {
168168
log.info "docker images"
169169
def actualQuery = query ?: [:]
170170
def defaults = [all: false]
@@ -177,7 +177,7 @@ class ManageImageClient implements ManageImage {
177177
}
178178

179179
@Override
180-
pruneImages(query = [:]) {
180+
EngineResponse pruneImages(query = [:]) {
181181
log.info "docker image prune"
182182
def actualQuery = query ?: [:]
183183
queryUtil.jsonEncodeFilters(actualQuery)
@@ -208,7 +208,7 @@ class ManageImageClient implements ManageImage {
208208
}
209209

210210
@Override
211-
push(imageName, authBase64Encoded = ".", registry = "") {
211+
EngineResponse push(String imageName, String authBase64Encoded = ".", String registry = "") {
212212
log.info "docker push '${imageName}'"
213213

214214
def actualImageName = imageName
@@ -226,14 +226,14 @@ class ManageImageClient implements ManageImage {
226226
}
227227

228228
@Override
229-
rmi(imageId) {
229+
EngineResponse rmi(imageId) {
230230
log.info "docker rmi"
231231
def response = client.delete([path: "/images/${imageId}".toString()])
232232
return response
233233
}
234234

235235
@Override
236-
save(... images) {
236+
EngineResponse save(... images) {
237237
log.info "docker save"
238238

239239
def response
@@ -250,7 +250,7 @@ class ManageImageClient implements ManageImage {
250250
}
251251

252252
@Override
253-
tag(imageId, repository) {
253+
EngineResponse tag(imageId, repository) {
254254
log.info "docker tag"
255255
def repoAndTag = repositoryTagParser.parseRepositoryTag(repository)
256256
def response = client.post([path : "/images/${imageId}/tag".toString(),

0 commit comments

Comments
 (0)