Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit b939b8b

Browse files
author
Matthieu Nottale
committed
Introduce and use resto for registry operations. Remove save and ls.
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
1 parent b83fb00 commit b939b8b

216 files changed

Lines changed: 25206 additions & 829 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Gopkg.lock

Lines changed: 67 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121

2222
required = ["github.com/wadey/gocovmerge"]
2323

24+
# We need runc at least 0.0.9 to get otherwise missing stubs for non-linux platforms.
25+
# We need > 0.1.1 as it depends on uppercase Sirupsen/logrus.
26+
[[override]]
27+
name = "github.com/opencontainers/runc"
28+
version = "v1.0.0-rc5"
29+
2430
[[constraint]]
2531
name = "github.com/docker/cli"
2632
branch = "master"
@@ -49,10 +55,6 @@ required = ["github.com/wadey/gocovmerge"]
4955
name = "github.com/docker/swarmkit"
5056
revision = "edd5641391926a50bc5f7040e20b7efc05003c26"
5157

52-
[[override]]
53-
name = "github.com/opencontainers/runc"
54-
revision = "ad0f5255060d36872be04de22f8731f38ef2d7b1"
55-
5658
[[override]]
5759
name = "k8s.io/kubernetes"
5860
revision = "v1.11.1"

README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -191,16 +191,14 @@ You can push any application to the Hub using `docker-app push`:
191191
$ docker-app push --namespace myHubUser --tag latest
192192
```
193193

194-
This command will create an image named `myHubUser/hello.dockerapp:latest` on your local Docker
195-
daemon, and push it to the Hub.
194+
This command will push to the Hub an image named `myHubUser/hello.dockerapp:latest`.
196195

197196
By default, this command uses the application version defined in `metadata.yml` as the tag,
198197
and the value of the metadata field `namespace` as the image namespace.
199198

200-
All `docker-app` commands accept a local image name as input, which means you can run on a different host:
199+
All `docker-app` commands accept an image name as input, which means you can run on a different host:
201200

202201
``` bash
203-
$ docker pull myHubUser/hello.dockerapp:latest
204202
$ docker-app inspect myHubUser/hello
205203
```
206204

@@ -258,11 +256,9 @@ Commands:
258256
helm Generate a Helm chart
259257
init Start building a Docker application
260258
inspect Shows metadata and settings for a given application
261-
ls List applications.
262259
merge Merge a multi-file application into a single file
263260
push Push the application to a registry
264261
render Render the Compose file for the application
265-
save Save the application as an image to the docker daemon(in preparation for push)
266262
split Split a single-file application into multiple files
267263
validate Checks the rendered application is syntactically correct
268264
version Print version information

cmd/docker-app/load.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

cmd/docker-app/ls.go

Lines changed: 0 additions & 25 deletions
This file was deleted.

cmd/docker-app/pull.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ func pullCmd() *cobra.Command {
1212
Short: "Pull an application from a registry",
1313
Args: cli.ExactArgs(1),
1414
RunE: func(cmd *cobra.Command, args []string) error {
15-
return packager.Pull(args[0])
15+
_, err := packager.Pull(args[0], ".")
16+
return err
1617
},
1718
}
1819
}

cmd/docker-app/push.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package main
22

33
import (
4+
"fmt"
5+
46
"github.com/docker/app/internal/packager"
57
"github.com/docker/cli/cli"
68
"github.com/spf13/cobra"
@@ -23,7 +25,11 @@ func pushCmd() *cobra.Command {
2325
return err
2426
}
2527
defer app.Cleanup()
26-
return packager.Push(app, opts.namespace, opts.tag)
28+
dgst, err := packager.Push(app, opts.namespace, opts.tag)
29+
if err == nil {
30+
fmt.Println(dgst)
31+
}
32+
return err
2733
},
2834
}
2935
cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Namespace to use (default: namespace in metadata)")

cmd/docker-app/root.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,9 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
4848
helmCmd(),
4949
initCmd(),
5050
inspectCmd(dockerCli),
51-
lsCmd(),
5251
mergeCmd(dockerCli),
5352
pushCmd(),
5453
renderCmd(dockerCli),
55-
saveCmd(dockerCli),
5654
splitCmd(),
5755
validateCmd(),
5856
versionCmd(dockerCli),
@@ -62,7 +60,6 @@ func addCommands(cmd *cobra.Command, dockerCli command.Cli) {
6260
cmd.AddCommand(
6361
imageAddCmd(),
6462
imageLoadCmd(),
65-
loadCmd(),
6663
packCmd(dockerCli),
6764
pullCmd(),
6865
unpackCmd(),

cmd/docker-app/save.go

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)