This repository was archived by the owner on May 6, 2020. It is now read-only.
cc-proxy: Fix systemd socket and service #43
Merged
Conversation
This file contains hidden or 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
Some paths provided in the cc-proxy.service and cc-proxy.socket were both relying on legacy path names from cc-oci-runtime. This directly led the cc-proxy service to be not started as expected when the proxy socket was used. Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
dlespiau
reviewed
May 2, 2017
cc-proxy.service.in
Outdated
|
|
||
| [Service] | ||
| ExecStart=@libexecdir@/cc-proxy | ||
| ExecStart=@libexecdir@/clearcontainers/cc-proxy |
Contributor
There was a problem hiding this comment.
can we standardise on clear-containers? see clearcontainers/runtime#85
dlespiau
reviewed
May 3, 2017
Makefile
Outdated
|
|
||
| SOURCES := $(shell find . 2>&1 | grep -E '.*\.(c|h|go)$$') | ||
| PROXY_SOCKET := $(LOCALSTATEDIR)/run/clearcontainers/proxy.sock | ||
| PROXY_SOCKET := $(LOCALSTATEDIR)/run/$(CLEARCONTAINERS_SUFFIX)/proxy.sock |
Contributor
There was a problem hiding this comment.
s/_SUFFIX// that's not really a suffix DIR maybe? or just have clear-containers everywhere
Contributor
Author
There was a problem hiding this comment.
If you're fine with hardcoding this "clear-containers" everywhere, I am fine with it.
@jodh-intel any thought on this ?
There was a problem hiding this comment.
I'd rename to something like CLEAR_CONTAINERS_DIR for legibility.
Contributor
|
I'm absolutely fine with this |
Because it has been decided that clear-containers will be cleaner and because we want to be consistent accross all projects, let's replace "clearcontainers" with "clear-containers". Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
Contributor
Author
|
@dlespiau Does that sound good now ? |
Contributor
|
I would squash the two commits together, you're changing the same strings twice in a row! but let's move on :) lgtm |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Some paths provided in the cc-proxy.service and cc-proxy.socket were both relying on legacy path names from cc-oci-runtime. This directly led the cc-proxy service to be not started as expected when the proxy socket was used.