set and use $port whenever $PROC_TYPE == 'web' #1341
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Author
|
@josegonzalez I think we just missed this use case. Not sure we want to add a deploy test specifically for this though. Thoughts? |
dokku
Outdated
Member
There was a problem hiding this comment.
The first if/elif stanza can probably be simplified a bit as well.
Member
There was a problem hiding this comment.
Like, we check several times what the PROC_TYPE is, as well as two checks on BIND_EXTERNAL.
Member
Author
There was a problem hiding this comment.
I guess I meant, do you have a recommendation?
Member
There was a problem hiding this comment.
Something like:
if [[ "$PROC_TYPE" == "web" ]]; then
port=${DOKKU_DOCKERFILE_PORT:=5000}
if [[ "$BIND_EXTERNAL" = "true" ]]; then
id=$(docker run -d -p $port -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
port=$(docker port $id $port | sed 's/[0-9.]*://')
ipaddr=127.0.0.1
else
id=$(docker run -d -e PORT=$port $DOCKER_ARGS $IMAGE $START_CMD)
ipaddr=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' $id)
fi
else
id=$(docker run -d $DOCKER_ARGS $IMAGE $START_CMD)
fi
shrug
Member
Author
There was a problem hiding this comment.
oh oh oh yeah sorry I was overthinking it. this makes sense.
Member
|
No test needed imo. |
michaelshobbs
added a commit
that referenced
this pull request
Jul 24, 2015
…ns-vhost set and use $port whenever $PROC_TYPE == 'web'
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This honors
$DOKKU_DOCKERFILE_PORTwhen binding the docker container to an external IP.refs #1336