[24/40] incubator-senssoft git commit: using tap docker
using tap docker Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/2f186ed3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/2f186ed3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/2f186ed3 Branch: refs/heads/asf-site Commit: 2f186ed3aeb321d18568ea7cc1e992a096cf695e Parents: f4d5ba4 Author: msb3399 Authored: Wed Aug 9 11:47:06 2017 -0400 Committer: msb3399 Committed: Wed Aug 9 11:47:06 2017 -0400 -- docker/docker-compose.yml | 36 +++- docker/tap/Dockerfile | 11 +-- 2 files changed, 24 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/2f186ed3/docker/docker-compose.yml -- diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index b1337f2..09580a7 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -130,6 +130,25 @@ services: networks: - esnet + # TAP's Database + db: +container_name: tap-db +build: ./db +ports: + - "5432:5432" + + # TAP + tap: +container_name: tap-web +build: ./tap +command: ["bash", "./wait-for-postgres.sh"] +ports: + - "8010:8010" +depends_on: + - db +links: + - db:db + volumes: esdata1: driver: local @@ -138,20 +157,3 @@ volumes: networks: esnet: - - # db: - # container_name: tap-db - # build: ./db - # ports: - # - "5432:5432" - - # tap: - # container_name: tap-web - # build: ./tap - # command: ["bash", "./wait-for-postgres.sh"] - # ports: - # - "8000:8000" - # depends_on: - # - db - # links: - # - db:db http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/2f186ed3/docker/tap/Dockerfile -- diff --git a/docker/tap/Dockerfile b/docker/tap/Dockerfile index 5fa380f..e0dd445 100644 --- a/docker/tap/Dockerfile +++ b/docker/tap/Dockerfile @@ -40,9 +40,8 @@ RUN sudo -E apt-get -yqq install \ git # Clone TAP -RUN git clone -b master https://github.com/apache/incubator-senssoft-tap.git app +RUN git clone -b tapdocker https://github.com/apache/incubator-senssoft-tap.git app WORKDIR /usr/src/app -RUN git pull # Install packages RUN npm install @@ -51,9 +50,9 @@ RUN npm install RUN pip install -r requirements.txt # Add application files -ADD secret.py /usr/src/app/tap/settings -ADD neon_counts.js /usr/src/app/public -ADD neon_graph.js /usr/src/app/public +ADD secrets/secret.py /usr/src/app/tap/settings +ADD secrets/neon_counts.js /usr/src/app/public +ADD secrets/neon_graph.js /usr/src/app/public # Add startup script ADD wait-for-postgres.sh /usr/src/app @@ -62,4 +61,4 @@ ADD wait-for-postgres.sh /usr/src/app RUN gulp build # Export port -EXPOSE 8000 +EXPOSE 8010
incubator-senssoft git commit: using tap docker
Repository: incubator-senssoft Updated Branches: refs/heads/master f4d5ba440 -> 2f186ed3a using tap docker Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/2f186ed3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/2f186ed3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/2f186ed3 Branch: refs/heads/master Commit: 2f186ed3aeb321d18568ea7cc1e992a096cf695e Parents: f4d5ba4 Author: msb3399 Authored: Wed Aug 9 11:47:06 2017 -0400 Committer: msb3399 Committed: Wed Aug 9 11:47:06 2017 -0400 -- docker/docker-compose.yml | 36 +++- docker/tap/Dockerfile | 11 +-- 2 files changed, 24 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/2f186ed3/docker/docker-compose.yml -- diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index b1337f2..09580a7 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -130,6 +130,25 @@ services: networks: - esnet + # TAP's Database + db: +container_name: tap-db +build: ./db +ports: + - "5432:5432" + + # TAP + tap: +container_name: tap-web +build: ./tap +command: ["bash", "./wait-for-postgres.sh"] +ports: + - "8010:8010" +depends_on: + - db +links: + - db:db + volumes: esdata1: driver: local @@ -138,20 +157,3 @@ volumes: networks: esnet: - - # db: - # container_name: tap-db - # build: ./db - # ports: - # - "5432:5432" - - # tap: - # container_name: tap-web - # build: ./tap - # command: ["bash", "./wait-for-postgres.sh"] - # ports: - # - "8000:8000" - # depends_on: - # - db - # links: - # - db:db http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/2f186ed3/docker/tap/Dockerfile -- diff --git a/docker/tap/Dockerfile b/docker/tap/Dockerfile index 5fa380f..e0dd445 100644 --- a/docker/tap/Dockerfile +++ b/docker/tap/Dockerfile @@ -40,9 +40,8 @@ RUN sudo -E apt-get -yqq install \ git # Clone TAP -RUN git clone -b master https://github.com/apache/incubator-senssoft-tap.git app +RUN git clone -b tapdocker https://github.com/apache/incubator-senssoft-tap.git app WORKDIR /usr/src/app -RUN git pull # Install packages RUN npm install @@ -51,9 +50,9 @@ RUN npm install RUN pip install -r requirements.txt # Add application files -ADD secret.py /usr/src/app/tap/settings -ADD neon_counts.js /usr/src/app/public -ADD neon_graph.js /usr/src/app/public +ADD secrets/secret.py /usr/src/app/tap/settings +ADD secrets/neon_counts.js /usr/src/app/public +ADD secrets/neon_graph.js /usr/src/app/public # Add startup script ADD wait-for-postgres.sh /usr/src/app @@ -62,4 +61,4 @@ ADD wait-for-postgres.sh /usr/src/app RUN gulp build # Export port -EXPOSE 8000 +EXPOSE 8010
