Skip to content

Commit

Permalink
moving UI support to build in consul UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@sstarcher
sstarcher committed Jan 21, 2016
1 parent d1b92ca commit 09e7dba
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 0 additions & 2 deletions 0.6/consul-server/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
FROM gliderlabs/consul-agent:0.6
ADD ./config /config/
ADD https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_web_ui.zip /tmp/webui.zip
RUN cd /tmp && mkdir /ui && unzip webui.zip -d /ui && rm webui.zip
ENTRYPOINT ["/bin/consul", "agent", "-server", "-config-dir=/config"]
3 changes: 1 addition & 2 deletions 0.6/consul-server/config/server.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"ui_dir": "/ui",
"server": true,
"ui": true,
"dns_config": {
"allow_stale": false
}
Expand Down

8 comments on commit 09e7dba

@grieke
Copy link

@grieke grieke commented on 09e7dba Jan 25, 2016

Choose a reason for hiding this comment

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

Why did you remove the adding of /ui directory in the docker file? Connection to port 8500 of the consul_server container now gets page not found error.

@sstarcher
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@grieke host:8500/ui should function

The ui_dir command is telling it where to find the ui data on disk. This should not be needed now that we are using the ui=true setting

@grieke
Copy link

@grieke grieke commented on 09e7dba Jan 25, 2016

Choose a reason for hiding this comment

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

The /ui directory is not in the container image anymore. Are you not going to continue building the ui into the server image?

@progrium
Copy link
Contributor

Choose a reason for hiding this comment

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

hashicorp/consul#1543

@progrium
Copy link
Contributor

Choose a reason for hiding this comment

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

see also changelog for 0.6.1 regarding -ui https://github.com/hashicorp/consul/blob/master/CHANGELOG.md#061-january-6-2016

@grieke
Copy link

@grieke grieke commented on 09e7dba Jan 25, 2016

Choose a reason for hiding this comment

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

I don't seem to find anything that references my question in those links. Is the ui already part of the consul_server container and you don't need to specify -ui-dir anymore, just -ui?

@sstarcher
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Correct if you read hashicorp/consul#1543 you will see it says the UI assets are now in the binary.

@grieke
Copy link

@grieke grieke commented on 09e7dba Jan 25, 2016

Choose a reason for hiding this comment

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

Thanks for the quick response to my question, removing the -ui-dir fixed my issue! Sorry I could not find that on my own :(. You saved me a lot of time!

Please sign in to comment.