Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

In Docker, {app,probe} -> {scope-app,scope-probe} #293

Merged
merged 1 commit into from
Jul 2, 2015

Conversation

peterbourgon
Copy link
Contributor

A "more correct" way of doing this would be renaming the app and probe directories to scope-app and scope-probe, but that makes importing the packages under probe very ugly. I think this strikes a reasonable balance: when doing the blessed build via make, we produce special scope-app and scope-probe binaries, and reference them in the various Docker scripts.

LMKWYT.

@peterbourgon
Copy link
Contributor Author

Oh, yeah: addresses #286

@@ -17,7 +17,8 @@ all: $(SCOPE_EXPORT)

$(SCOPE_EXPORT): $(APP_EXE) $(PROBE_EXE) docker/*
@if [ -z '$(DOCKER_SQUASH)' ]; then echo "Please install docker-squash by running 'make deps'." && exit 1; fi
cp $(APP_EXE) $(PROBE_EXE) docker/
cp $(APP_EXE) docker/scope-app
cp $(PROBE_EXE) docker/scope-probe

This comment was marked as abuse.

This comment was marked as abuse.

@tomwilkie
Copy link
Contributor

Is it important this goes in before release?

@peterbourgon
Copy link
Contributor Author

No.

@tomwilkie
Copy link
Contributor

LGTM; fine with approach. I'd hold off until after release, although up to you.

@peterbourgon
Copy link
Contributor Author

Happy to hold off.

@peterbourgon
Copy link
Contributor Author

We're post-release now.

peterbourgon added a commit that referenced this pull request Jul 2, 2015
In Docker, {app,probe} -> {scope-app,scope-probe}
@peterbourgon peterbourgon merged commit 37c99b7 into master Jul 2, 2015
@peterbourgon peterbourgon deleted the rename-components branch July 2, 2015 10:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants