Remove swarm and plugin support #14
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Network commands are built to query both the active cluster (if any) and the daemon. This commits makes them only deal with local networks. Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
Makes the system commands only deal with the local daemon, ignoring swarm clusters. Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
Removes support for docker Secrets, and docker Configs which are only usable within swarm mode Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
petrosagg
force-pushed
the
remove-swarm
branch
from
7576f0e
to
4803f4a
Compare
zozo123
reviewed
Aug 18, 2017
| @@ -88,7 +87,7 @@ type Container struct { | |||
| MountPoints map[string]*volume.MountPoint | |||
| HostConfig *containertypes.HostConfig `json:"-"` // do not serialize the host config in the json, otherwise we'll make the container unportable | |||
| ExecCommands *exec.Store `json:"-"` | |||
| DependencyStore agentexec.DependencyGetter `json:"-"` | |||
| DependencyStore interface{} `json:"-"` | |||
There was a problem hiding this comment.
Will it still allocates? I think these stuff are also defined in the protobuff. at containerd/containerd/api/grpc/types/api.pb.go
There was a problem hiding this comment.
It will allocate a pointer, which is always nil. I don't see it defined anywhere else
zozo123
reviewed
Aug 18, 2017
| } | ||
|
|
||
| return nil | ||
| return fmt.Errorf("secret store is not initialized") |
Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
petrosagg
force-pushed
the
remove-swarm
branch
from
4803f4a
to
695cc81
Compare
robertgzr
pushed a commit
that referenced
this pull request
Dec 19, 2019
Although the Dockerfile builds without it, adding wheel back should save some time ``` 00:45:28 #14 10.70 Building wheels for collected packages: pathspec, pyyaml 00:45:28 #14 10.70 Running setup.py bdist_wheel for pathspec: started 00:45:28 #14 10.88 Running setup.py bdist_wheel for pathspec: finished with status 'error' 00:45:28 #14 10.88 Complete output from command /usr/bin/python3 -u -c "import setuptools, tokenize;__file__='/tmp/pip-build-mbotnxes/pathspec/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" bdist_wheel -d /tmp/tmpg9pl4u6kpip-wheel- --python-tag cp35: 00:45:28 #14 10.88 usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] 00:45:28 #14 10.88 or: -c --help [cmd1 cmd2 ...] 00:45:28 #14 10.88 or: -c --help-commands 00:45:28 #14 10.88 or: -c cmd --help 00:45:28 #14 10.88 00:45:28 #14 10.88 error: invalid command 'bdist_wheel' 00:45:28 #14 10.88 00:45:28 #14 10.88 ---------------------------------------- 00:45:28 #14 10.88 Failed building wheel for pathspec 00:45:28 #14 10.88 Running setup.py clean for pathspec 00:45:28 #14 11.05 Running setup.py bdist_wheel for pyyaml: started 00:45:28 #14 11.25 Running setup.py bdist_wheel for pyyaml: finished with status 'error' 00:45:28 #14 11.25 Complete output from command /usr/bin/python3 -u -c "import setuptools, tokenize;__file__='/tmp/pip-build-mbotnxes/pyyaml/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" bdist_wheel -d /tmp/tmpyci_xi0bpip-wheel- --python-tag cp35: 00:45:28 #14 11.25 usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] 00:45:28 #14 11.25 or: -c --help [cmd1 cmd2 ...] 00:45:28 #14 11.25 or: -c --help-commands 00:45:28 #14 11.25 or: -c cmd --help 00:45:28 #14 11.25 00:45:28 #14 11.25 error: invalid command 'bdist_wheel' 00:45:28 #14 11.25 00:45:28 #14 11.25 ---------------------------------------- 00:45:28 #14 11.25 Failed building wheel for pyyaml 00:45:28 #14 11.25 Running setup.py clean for pyyaml 00:45:28 #14 11.44 Failed to build pathspec pyyaml 00:45:28 #14 11.45 Installing collected packages: pathspec, pyyaml, yamllint 00:45:28 #14 11.45 Running setup.py install for pathspec: started 00:45:29 #14 11.73 Running setup.py install for pathspec: finished with status 'done' 00:45:29 #14 11.73 Running setup.py install for pyyaml: started 00:45:29 #14 12.05 Running setup.py install for pyyaml: finished with status 'done' 00:45:29 #14 12.12 Successfully installed pathspec-0.5.9 pyyaml-5.1.2 yamllint-1.16.0 ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ad70bf6) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
roman-mazur
pushed a commit
that referenced
this pull request
Apr 8, 2020
Although the Dockerfile builds without it, adding wheel back should save some time ``` 00:45:28 #14 10.70 Building wheels for collected packages: pathspec, pyyaml 00:45:28 #14 10.70 Running setup.py bdist_wheel for pathspec: started 00:45:28 #14 10.88 Running setup.py bdist_wheel for pathspec: finished with status 'error' 00:45:28 #14 10.88 Complete output from command /usr/bin/python3 -u -c "import setuptools, tokenize;__file__='/tmp/pip-build-mbotnxes/pathspec/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" bdist_wheel -d /tmp/tmpg9pl4u6kpip-wheel- --python-tag cp35: 00:45:28 #14 10.88 usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] 00:45:28 #14 10.88 or: -c --help [cmd1 cmd2 ...] 00:45:28 #14 10.88 or: -c --help-commands 00:45:28 #14 10.88 or: -c cmd --help 00:45:28 #14 10.88 00:45:28 #14 10.88 error: invalid command 'bdist_wheel' 00:45:28 #14 10.88 00:45:28 #14 10.88 ---------------------------------------- 00:45:28 #14 10.88 Failed building wheel for pathspec 00:45:28 #14 10.88 Running setup.py clean for pathspec 00:45:28 #14 11.05 Running setup.py bdist_wheel for pyyaml: started 00:45:28 #14 11.25 Running setup.py bdist_wheel for pyyaml: finished with status 'error' 00:45:28 #14 11.25 Complete output from command /usr/bin/python3 -u -c "import setuptools, tokenize;__file__='/tmp/pip-build-mbotnxes/pyyaml/setup.py';f=getattr(tokenize, 'open', open)(__file__);code=f.read().replace('\r\n', '\n');f.close();exec(compile(code, __file__, 'exec'))" bdist_wheel -d /tmp/tmpyci_xi0bpip-wheel- --python-tag cp35: 00:45:28 #14 11.25 usage: -c [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] 00:45:28 #14 11.25 or: -c --help [cmd1 cmd2 ...] 00:45:28 #14 11.25 or: -c --help-commands 00:45:28 #14 11.25 or: -c cmd --help 00:45:28 #14 11.25 00:45:28 #14 11.25 error: invalid command 'bdist_wheel' 00:45:28 #14 11.25 00:45:28 #14 11.25 ---------------------------------------- 00:45:28 #14 11.25 Failed building wheel for pyyaml 00:45:28 #14 11.25 Running setup.py clean for pyyaml 00:45:28 #14 11.44 Failed to build pathspec pyyaml 00:45:28 #14 11.45 Installing collected packages: pathspec, pyyaml, yamllint 00:45:28 #14 11.45 Running setup.py install for pathspec: started 00:45:29 #14 11.73 Running setup.py install for pathspec: finished with status 'done' 00:45:29 #14 11.73 Running setup.py install for pyyaml: started 00:45:29 #14 12.05 Running setup.py install for pyyaml: finished with status 'done' 00:45:29 #14 12.12 Successfully installed pathspec-0.5.9 pyyaml-5.1.2 yamllint-1.16.0 ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commits are well split so I suggest commit by commit reviewing.