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.

Sign up for GitHub

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

Jump to bottom

Introduce a template-based custom docker server evaluation strategy #4928

Merged
merged 4 commits into from
May 12, 2017
Merged

Introduce a template-based custom docker server evaluation strategy #4928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
709a9d9
Introduce a custom server evaluation strategy
benoitf Apr 25, 2017
4016363
Fix property names
benoitf May 9, 2017
2d0ed83
use lazy init
benoitf May 9, 2017
b4e633f
fixup! Introduce a custom server evaluation strategy This custom serv…
benoitf May 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/codenvy/che.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,28 @@ che.docker.ip.external=NULL
# - 'default': internal address is address of docker host and ephemeral port are used
# - 'docker-local': internal address is address of container within docker network, and exposed ports
# are used.
# - 'custom': The evaluation strategy may be customized through a template property.
# The 'docker-local' strategy may be useful if a firewall prevents communication between che-server and
# workspace containers, but will prevent communication when che-server and workspace containers are not
# on the same Docker network.
che.docker.server_evaluation_strategy=default


# Here are macros available for the custom server evaluation strategy
# serverName: server reference exposing the port (like tomcat8, ws-agent, etc)
# machineName: name of the machine of the workspace. (like devMachine)
# workspaceId: id of the workspace
# internalIp: IP of the internal address of che (che.docker.ip property)
# externalIP: IP of the external address of che
# externalAddresss : external address of che (che.docker.ip.external or if null che.docker.ip)
# chePort : Che listening port number of workspace master
# wildcardNipDomain : get external address transformed into a nip.io DNS sub-domain
# wildcardXipDomain : get external address transformed into a xip.io DNS sub-domain
che.docker.server_evaluation_strategy.custom.template=<serverName>.<machineName>.<workspaceId>.<wildcardNipDomain>:<chePort>

# Protocol to use for http access (for example it can be set to https)
che.docker.server_evaluation_strategy.custom.external.protocol=http

# Provides a Docker network where Che server is running.
# Workspace containers created by Che will be added to this Docker network.
# Communications between the Che server and container occur over this network.
Expand Down
4 changes: 4 additions & 0 deletions plugins/plugin-docker/che-plugin-docker-machine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>ST4</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.che.core</groupId>
<artifactId>che-core-api-core</artifactId>
Expand Down
Loading