incubator-senssoft-tap git commit: cleaned up tap images.

[ms...@apache.org]

Repository: incubator-senssoft-tap
Updated Branches:
  refs/heads/tapdocker 76cb5d97b -> e7a920f10


cleaned up tap images.


Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/commit/e7a920f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/tree/e7a920f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/diff/e7a920f1

Branch: refs/heads/tapdocker
Commit: e7a920f1019fd99e310a9fc073b9dc6995ae21a6
Parents: 76cb5d9
Author: msb3399 <mb...@draper.com>
Authored: Wed Jul 12 13:15:51 2017 -0400
Committer: msb3399 <mb...@draper.com>
Committed: Wed Jul 12 13:15:51 2017 -0400

----------------------------------------------------------------------
 .dockerignore      |  1 -
 Dockerfile         | 45 ++++++++++++++++++++++++++++++++++-----------
 docker-compose.yml |  3 +--
 3 files changed, 35 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/blob/e7a920f1/.dockerignore
----------------------------------------------------------------------
diff --git a/.dockerignore b/.dockerignore
index 744344a..df14091 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -22,4 +22,3 @@ es
 docs
 doc_requirements.txt
 docker
-docker-compose.yml
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/blob/e7a920f1/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 264d265..7ac532e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 FROM python:3.4
 MAINTAINER Michelle Beard <ms...@apache.org>
 
@@ -7,28 +22,36 @@ RUN apt-get -yqq update && apt-get -yqq install \
 	sudo
 
 # Install NodeJS 4.x
-RUN curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -
+RUN curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
 
 RUN sudo -E apt-get -yqq install \
 	nodejs \
-	build-essential 
+	build-essential
 
-# Set the work directory
-RUN mkdir -p /usr/src
-WORKDIR /usr/src
-COPY . /usr/src
+# Set the app directory
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
 
-# Install gulp
-RUN npm install -g bower gulp
+# Install app dependencies
+COPY package.json /usr/src/app
+COPY requirements.txt /usr/src/app
+COPY semantic.json /usr/src/app
+COPY semantic /usr/src/app
 
-# Install packages
-RUN npm install 
+# Install gulp
+RUN npm install
+RUN npm install -g gulp bower
 
 # Install TAP requirements
 RUN pip install -r requirements.txt
 
+# Bundle app source
+COPY . /usr/src/app
+
 # Startup Application
-RUN gulp build
+#RUN gulp build
+
+RUN chmod +x /usr/src/app/wait-for-postgres.sh
 
 # Export port
 EXPOSE 8000

http://git-wip-us.apache.org/repos/asf/incubator-senssoft-tap/blob/e7a920f1/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker-compose.yml b/docker-compose.yml
index 19a00cb..510539b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,8 +25,7 @@ services:
   tap:
     container_name: tap-web
     build: .
-    command: bash -c "/usr/src/wait-for-postgres.sh"
-    # command: bash -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
+    command: bash -c "/usr/src/app/wait-for-postgres.sh"
     ports:
       - "8000:8000"
     depends_on: