You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@senssoft.apache.org by rf...@apache.org on 2017/03/22 21:18:27 UTC
[1/5] incubator-senssoft git commit: Added secret file for TAP to
gitignore
Repository: incubator-senssoft
Updated Branches:
refs/heads/docker-build 1c10c7835 -> 93d96dc91
Added secret file for TAP to gitignore
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/c3d578fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/c3d578fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/c3d578fd
Branch: refs/heads/docker-build
Commit: c3d578fd9fc85410444cd381480b90b9405d0b28
Parents: 1c10c78
Author: Rob Foley <ro...@gmail.com>
Authored: Wed Mar 22 16:05:53 2017 -0400
Committer: Rob Foley <ro...@gmail.com>
Committed: Wed Mar 22 16:05:53 2017 -0400
----------------------------------------------------------------------
.gitignore | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/c3d578fd/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index f9cd107..c1edf37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
.sass-cache
.jekyll-metadata
-
+secret.py
node_modules/
.npm
npm-debug.log
[5/5] incubator-senssoft git commit: Added startup script
Posted by rf...@apache.org.
Added startup script
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/93d96dc9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/93d96dc9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/93d96dc9
Branch: refs/heads/docker-build
Commit: 93d96dc91f98ee3d88b9abba1df14eb45ee2022d
Parents: 6b884a9
Author: Rob Foley <ro...@gmail.com>
Authored: Wed Mar 22 17:18:05 2017 -0400
Committer: Rob Foley <ro...@gmail.com>
Committed: Wed Mar 22 17:18:05 2017 -0400
----------------------------------------------------------------------
docker/tap/Dockerfile | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/93d96dc9/docker/tap/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/tap/Dockerfile b/docker/tap/Dockerfile
index 24f7291..5fa380f 100644
--- a/docker/tap/Dockerfile
+++ b/docker/tap/Dockerfile
@@ -55,6 +55,8 @@ 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 startup script
+ADD wait-for-postgres.sh /usr/src/app
# Startup Application
RUN gulp build
[2/5] incubator-senssoft git commit: Updated port to reflect change
in docker-compose
Posted by rf...@apache.org.
Updated port to reflect change in docker-compose
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/00c99ebf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/00c99ebf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/00c99ebf
Branch: refs/heads/docker-build
Commit: 00c99ebf7cf38b03c6f9dcb872b31e9333d1ab30
Parents: c3d578f
Author: Rob Foley <ro...@gmail.com>
Authored: Wed Mar 22 16:24:56 2017 -0400
Committer: Rob Foley <ro...@gmail.com>
Committed: Wed Mar 22 16:24:56 2017 -0400
----------------------------------------------------------------------
docker/logstash/config/logstash-userale.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/00c99ebf/docker/logstash/config/logstash-userale.conf
----------------------------------------------------------------------
diff --git a/docker/logstash/config/logstash-userale.conf b/docker/logstash/config/logstash-userale.conf
index 0c30077..217a4dd 100644
--- a/docker/logstash/config/logstash-userale.conf
+++ b/docker/logstash/config/logstash-userale.conf
@@ -1,7 +1,7 @@
input {
http {
codec => "json"
- port => 8000
+ port => 8080
response_headers => {
"Access-Control-Allow-Origin" => "*"
"Access-Control-Allow-Headers" => "Origin, X-Requested-With, Content-Type, Accept"
[3/5] incubator-senssoft git commit: Initial commit for script to
retry server startup until Postgres is ready
Posted by rf...@apache.org.
Initial commit for script to retry server startup until Postgres is ready
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/d8f0f7c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/d8f0f7c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/d8f0f7c6
Branch: refs/heads/docker-build
Commit: d8f0f7c6930cd17f042c8a188e57abc166e9fedb
Parents: 00c99eb
Author: Rob Foley <ro...@gmail.com>
Authored: Wed Mar 22 17:16:48 2017 -0400
Committer: Rob Foley <ro...@gmail.com>
Committed: Wed Mar 22 17:16:48 2017 -0400
----------------------------------------------------------------------
docker/tap/wait-for-postgres.sh | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/d8f0f7c6/docker/tap/wait-for-postgres.sh
----------------------------------------------------------------------
diff --git a/docker/tap/wait-for-postgres.sh b/docker/tap/wait-for-postgres.sh
new file mode 100644
index 0000000..96084c7
--- /dev/null
+++ b/docker/tap/wait-for-postgres.sh
@@ -0,0 +1,27 @@
+# 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.
+
+#!/bin/bash
+
+delay=2
+sleep $delay
+n=0
+until [ $n -ge 3 ]
+do
+ python manage.py migrate && python manage.py runserver 0.0.0.0:8000 && break
+ echo "Retrying connection in $delay seconds..."
+ n=$[$n+1]
+ sleep 2
+done
[4/5] incubator-senssoft git commit: Updated port for logstash.
Updated distill context. Added startup script for TAP
Posted by rf...@apache.org.
Updated port for logstash. Updated distill context. Added startup script for TAP
Project: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/commit/6b884a9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/tree/6b884a9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-senssoft/diff/6b884a9a
Branch: refs/heads/docker-build
Commit: 6b884a9a66742db077372bd1f741b1b2ec6eec55
Parents: d8f0f7c
Author: Rob Foley <ro...@gmail.com>
Authored: Wed Mar 22 17:17:40 2017 -0400
Committer: Rob Foley <ro...@gmail.com>
Committed: Wed Mar 22 17:17:40 2017 -0400
----------------------------------------------------------------------
docker/docker-compose.yml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-senssoft/blob/6b884a9a/docker/docker-compose.yml
----------------------------------------------------------------------
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 97ee0cb..b1e552b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -42,7 +42,7 @@ services:
container_name: senssoft-userale-forwarder
command: -f /etc/logstash/conf.d
ports:
- - 8000:8000
+ - 8080:8080
volumes:
- ./logstash/config/logstash-userale.conf:/etc/logstash/conf.d/logstash-userale.conf
- ./logstash/templates/userale.json:/usr/share/logstash/templates/userale.json
@@ -51,9 +51,7 @@ services:
environment:
LS_HEAP_SIZE: "2048m"
distill:
- build:
- context: .
- dockerfile: ./distill/Dockerfile
+ build: ./distill
container_name: distill
ports:
- 8090:8090
@@ -69,7 +67,7 @@ services:
tap:
container_name: tap-web
build: ./tap
- command: bash -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
+ command: ["bash", "./wait-for-postgres.sh"]
ports:
- "8000:8000"
depends_on: