From e73c89abc842e14042abd2ff76b7a42e0ac84287 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Mon, 25 Apr 2016 18:47:33 -0700 Subject: [PATCH 1/2] include dockerfile-procfile test app in Makefile --- tests.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests.mk b/tests.mk index 2ad8b345d..8754486df 100644 --- a/tests.mk +++ b/tests.mk @@ -99,6 +99,10 @@ deploy-test-dockerfile-noexpose: @echo deploying dockerfile-noexpose app... cd tests && ./test_deploy ./apps/dockerfile-noexpose dokku.me +deploy-test-dockerfile-procfile: + @echo deploying dockerfile-procfile app... + cd tests && ./test_deploy ./apps/dockerfile-procfile dokku.me + deploy-test-gitsubmodules: @echo deploying gitsubmodules app... cd tests && ./test_deploy ./apps/gitsubmodules dokku.me @@ -154,6 +158,7 @@ deploy-tests: @$(QUIET) $(MAKE) deploy-test-clojure @$(QUIET) $(MAKE) deploy-test-dockerfile @$(QUIET) $(MAKE) deploy-test-dockerfile-noexpose + @$(QUIET) $(MAKE) deploy-test-dockerfile-procfile @$(QUIET) $(MAKE) deploy-test-gitsubmodules @$(QUIET) $(MAKE) deploy-test-go @$(QUIET) $(MAKE) deploy-test-java From be13b0149a1d5a26370f01fe644afa482977fca8 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Mon, 25 Apr 2016 18:47:39 -0700 Subject: [PATCH 2/2] use node base image instead of ubuntu --- tests/apps/dockerfile-procfile/Dockerfile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/apps/dockerfile-procfile/Dockerfile b/tests/apps/dockerfile-procfile/Dockerfile index cd47658a5..fa82185d5 100644 --- a/tests/apps/dockerfile-procfile/Dockerfile +++ b/tests/apps/dockerfile-procfile/Dockerfile @@ -1,14 +1,9 @@ -FROM ubuntu:trusty -ENV LC_ALL C -ENV DEBIAN_FRONTEND noninteractive -ENV DEBCONF_NONINTERACTIVE_SEEN true +FROM node:4 + 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 build-essential curl postgresql-client-9.3 nodejs git - COPY . /app WORKDIR /app RUN npm install