Finished TAP docker production build.
diff --git a/docker-compose.yml b/docker-compose.yml
index 03d0d96..56c49aa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,21 +13,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Apache TAP Development Docker build
+# Apache TAP Production Build
version: "2"
services:
db:
- image: postgres:latest
- volumes:
- - ./sql.sh:/docker-entrypoint-initdb.d/sql.sh
+ container_name: tap-db
+ build: ./docker/db
ports:
- "5432:5432"
tap:
- build:
- context: .
- dockerfile: ./docker/tap/dockerfile
- # command: python manage.py runserver 0.0.0.0:8000
+ container_name: tap-web
+ build: ./docker/tap
+ command: python manage.py runserver 0.0.0.0:8000
ports:
- "8000:8000"
depends_on:
diff --git a/docker/db/Dockerfile b/docker/db/Dockerfile
new file mode 100644
index 0000000..673eca4
--- /dev/null
+++ b/docker/db/Dockerfile
@@ -0,0 +1,19 @@
+# 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 postgres:latest
+MAINTAINER Michelle Beard <msbeard@apache.org>
+
+ADD sql.sh docker-entrypoint-initdb.d/sql.sh
\ No newline at end of file
diff --git a/sql.sh b/docker/db/sql.sh
similarity index 100%
rename from sql.sh
rename to docker/db/sql.sh
diff --git a/docker/tap/Dockerfile b/docker/tap/Dockerfile
index f699895..d6a06e6 100644
--- a/docker/tap/Dockerfile
+++ b/docker/tap/Dockerfile
@@ -14,7 +14,7 @@
# limitations under the License.
FROM python:3.4
-MAINTAINER Arthi <demo@apache.org>
+MAINTAINER Michelle Beard <msbeard@apache.org>
# Install system wide dependencies
RUN apt-get -yqq update && apt-get -yqq install \
@@ -29,28 +29,33 @@
build-essential
# Set the work directory
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
+RUN mkdir -p /usr/src
+WORKDIR /usr/src
# Install gulp
RUN npm install -g bower gulp
-# Add package.json before adding application files
-ADD package.json /usr/src/app
-ADD semantic.json /usr/src/app
+# Install git
+RUN sudo -E apt-get -yqq install \
+ git
+
+# Clone TAP
+RUN git clone -b docker https://github.com/apache/incubator-senssoft-tap.git app
+WORKDIR /usr/src/app
+RUN git pull
# Install packages
RUN npm install
-# Add requirements file
-ADD requirements.txt /usr/src/app
-
# Install TAP requirements
RUN pip install -r requirements.txt
# Add application files
-ADD . /usr/src/app
+ADD secret.py /usr/src/app/tap/settings
+ADD neon_counts.js /usr/src/app/public
+ADD neon_graph.js /usr/src/app/public
+# Export port
EXPOSE 8000
# Startup Application
diff --git a/docker/tap/README.md b/docker/tap/README.md
new file mode 100644
index 0000000..eaf43b2
--- /dev/null
+++ b/docker/tap/README.md
@@ -0,0 +1,2 @@
+Copy neon_*.json files here until we integrate w/Distill
+
