fixes #1259 now ignores protocol of Dockerfile EXPOSE
This commit is contained in:
@@ -36,7 +36,7 @@ case "$1" in
|
|||||||
|
|
||||||
dockerfile)
|
dockerfile)
|
||||||
# extract first port from Dockerfile
|
# extract first port from Dockerfile
|
||||||
DOCKERFILE_PORT=$(grep EXPOSE Dockerfile | head -1 | awk '{ print $2 }' || true)
|
DOCKERFILE_PORT=$(grep "^EXPOSE \+[[:digit:]]\+\(\/tcp\)\? *$" Dockerfile | head -1 | sed 's/EXPOSE \+\([[:digit:]]\+\)\(\/tcp\)\?.*/\1/' || true)
|
||||||
[[ -n "$DOCKERFILE_PORT" ]] && dokku config:set-norestart $APP DOKKU_DOCKERFILE_PORT=$DOCKERFILE_PORT
|
[[ -n "$DOCKERFILE_PORT" ]] && dokku config:set-norestart $APP DOKKU_DOCKERFILE_PORT=$DOCKERFILE_PORT
|
||||||
|
|
||||||
# buildstep pluginhooks don't necessarily make sense for dockerfiles. call the new breed!!!
|
# buildstep pluginhooks don't necessarily make sense for dockerfiles. call the new breed!!!
|
||||||
|
|||||||
@@ -2,7 +2,9 @@ FROM ubuntu:trusty
|
|||||||
ENV LC_ALL C
|
ENV LC_ALL C
|
||||||
ENV DEBIAN_FRONTEND noninteractive
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
ENV DEBCONF_NONINTERACTIVE_SEEN true
|
ENV DEBCONF_NONINTERACTIVE_SEEN true
|
||||||
EXPOSE 3000
|
EXPOSE 3001/udp
|
||||||
|
EXPOSE 3000/tcp
|
||||||
|
EXPOSE 3003
|
||||||
|
|
||||||
RUN apt-get install -y software-properties-common && add-apt-repository ppa:chris-lea/node.js && apt-get update
|
RUN apt-get install -y software-properties-common && add-apt-repository ppa:chris-lea/node.js && apt-get update
|
||||||
RUN apt-get install -y build-essential curl postgresql-client-9.3 nodejs git
|
RUN apt-get install -y build-essential curl postgresql-client-9.3 nodejs git
|
||||||
|
|||||||
Reference in New Issue
Block a user