Skip to content
This repository has been archived by the owner on Feb 27, 2024. It is now read-only.

Fixed docker-compose.yml #607

Merged
merged 1 commit into from
Sep 19, 2015
Merged

Fixed docker-compose.yml #607

merged 1 commit into from
Sep 19, 2015

Conversation

tombee
Copy link
Contributor

@tombee tombee commented Sep 18, 2015

This should fix #593

@@ -32,8 +32,7 @@ controller:
build: .
dockerfile: Dockerfile.build
entrypoint: /bin/bash
command: -c "sleep 5 && /go/src/github.com/shipyard/shipyard/controller/controller -D server --rethinkdb-addr rethinkdb:28015 -d tcp://swarm:2375"
working_dir: /go/src/github.com/shipyard/shipyard/controller
command: -c "make build && cd controller && ./controller -D server --rethinkdb-addr rethinkdb:28015 -d tcp://swarm:2375"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have to run make build from our default working directory /go/src/github.com/shipyard/shipyard.

We then have to run the built controller binary from /go/src/github.com/shipyard/shipyard/controller due to it serving the static/ folder from a relative path, hence the addition of cd controller.

@ehazlett
Copy link
Owner

LGTM

ehazlett added a commit that referenced this pull request Sep 19, 2015
@ehazlett ehazlett merged commit e20c9e4 into ehazlett:master Sep 19, 2015
@tombee tombee deleted the compose-fix branch November 17, 2016 10:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants