Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Configuration/Web/nginx_vhost.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
server {
listen 8080;
listen 80;
# TODO: Maybe we can just use $hostname instead
server_name DOCKER_FLOW_SERVERNAME;

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ WEB_CONTAINER_IP project-url
WEB_CONTAINER_IP test.project-url
```

You need to define the default test suite url in your `behat.yml` to use `http://test.project-url:8080` and then you can
You need to define the default test suite url in your `behat.yml` to use `http://test.project-url` and then you can
run the behat tests without having to connect external selenium server

```
Expand Down
7 changes: 3 additions & 4 deletions bin/dockerflow
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ wrapped_command="docker-compose -p \"${projectname}\" -f ${package_dir}/docker-c
DOCKER_FLOW_SERVERNAME=${projectname}

# Default port for dockerflow
DOCKER_FLOW_PORT=8080
DOCKER_FLOW_PORT=80

# Use Development context if Flow Context is not set
DOCKER_FLOW_CONTEXT=${FLOW_CONTEXT:=Development}
Expand Down Expand Up @@ -58,9 +58,8 @@ if [ "$action" = "up" ]; then
${wrapped_command} run --rm app /entrypoint.sh

# Print information about running app container
used_port=`${wrapped_command} port web ${DOCKER_FLOW_PORT} | sed 's/^.*\:\([0-9]*\).*$/\1/g'`
echo "####"
echo "### Done! Your app is running here : ${projectname}:${used_port}"
echo "### Testing context is running here : test.${projectname}:${used_port}"
echo "### Done! Your app is running here : ${projectname}"
echo "### Testing context is running here : test.${projectname}"
echo "####"
fi
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ db:
web:
image: nginx:1.7
ports:
- "8080:8080"
- "80:80"
volumes:
- ./Configuration/Web/nginx.conf:/etc/nginx/nginx.conf:ro
- ./Configuration/Web/nginx_vhost_merged.conf:/etc/nginx/conf.d/default.conf:ro
Expand Down