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

Commit cbdc839

Browse files
Mark the app plugin as an experimental plugin. Only a cli with experimental flag enabled will list docker app as a plugin.
Bump docker/cli to the last 19.03 Signed-off-by: Silvin Lubecki <[email protected]>
1 parent f5f3873 commit cbdc839

File tree

10 files changed

+48
-22
lines changed

10 files changed

+48
-22
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN apt-get install -y -q --no-install-recommends \
88

99
WORKDIR /go/src/github.com/docker/cli
1010

11-
RUN git clone https://github.com/docker/cli . && git checkout 2432af701a7973ea582196b4b9488831156f3458
11+
RUN git clone https://github.com/docker/cli . && git checkout a1b83ffd2cbeefc0752e5aa7a543d49c1ddfd2cb
1212

1313
RUN make binary-osx binary-windows binary && \
1414
cp build/docker-linux-amd64 /usr/bin/docker

Gopkg.lock

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

cmd/docker-app/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@ func main() {
2727
SchemaVersion: "0.1.0",
2828
Vendor: "Docker Inc.",
2929
Version: internal.Version,
30+
Experimental: true,
3031
})
3132
}

e2e/main_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ func (d dockerCliCommand) createTestCmd(ops ...ConfigFileOperator) (icmd.Cmd, fu
6161
cleanup := func() {
6262
os.RemoveAll(configDir)
6363
}
64-
env := append(os.Environ(), "DOCKER_CONFIG="+configDir)
64+
env := append(os.Environ(),
65+
"DOCKER_CONFIG="+configDir,
66+
"DOCKER_CLI_EXPERIMENTAL=enabled") // TODO: Remove this once docker app plugin is no more experimental
6567
return icmd.Cmd{Env: env}, cleanup
6668
}
6769

vendor/github.com/docker/cli/cli-plugins/manager/manager.go

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

vendor/github.com/docker/cli/cli-plugins/manager/metadata.go

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

vendor/github.com/docker/cli/cli-plugins/manager/plugin.go

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

vendor/github.com/docker/cli/cli/command/cli.go

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

vendor/github.com/docker/cli/cli/context/kubernetes/load.go

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

vendor/github.com/docker/cli/kubernetes/config.go

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

0 commit comments

Comments
 (0)