Extended default redis polling time

diff --git a/builder/entrypoint.sh b/builder/entrypoint.sh
index 9db721d9f4d9db9d97dd0d96beaf3e0fc9f20b35..1013354345995fe494a535d94c37b53dc18d919c 100755 (executable)
--- a/builder/entrypoint.sh
+++ b/builder/entrypoint.sh
@@ -8,14 +8,17 @@ function intr() {
 
 trap intr SIGINT
 
 
 trap intr SIGINT
 

-echo Starting builder polling...
+SLEEP_INT=$1
+[[ -n "$SLEEP_INT" ]] || SLEEP_INT=60
+
+echo Starting builder polling every $SLEEP_INT seconds...

 
 # polls a redis queue for jobs, starts the builder when it's got some
 while true
 do
     SNAPSHOT_URI=$(redis-cli -h redis LPOP snapshots)
     [[ -n "$SNAPSHOT_URI" ]] && ./godot-export.sh "$SNAPSHOT_URI"
 
 # polls a redis queue for jobs, starts the builder when it's got some
 while true
 do
     SNAPSHOT_URI=$(redis-cli -h redis LPOP snapshots)
     [[ -n "$SNAPSHOT_URI" ]] && ./godot-export.sh "$SNAPSHOT_URI"

-    sleep 1
+    sleep $SLEEP_INT

 done
 
 
 done
 
 

diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index db77db559570b3de98dd5b60193fefcfd0c12670..807a666afcdc26812574a7849b094a2fa129b54a 100644 (file)
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -10,6 +10,8 @@ services:
         volumes:
         - ./nginx/conf.d/:/etc/nginx/conf.d/
         - godot-build:/build
         volumes:
         - ./nginx/conf.d/:/etc/nginx/conf.d/
         - godot-build:/build

+        depends_on:
+        - redis

         networks:
         - proxy
         - backend
         networks:
         - proxy
         - backend


@@ -18,10 +20,12 @@ services:
         networks:
         - backend
     builder:
         networks:
         - backend
     builder:

-        image: cjpalmer/godot-builder:0.3.0
+        image: cjpalmer/godot-builder:0.3.1

         volumes:
         - godot-build:/build
         - godot-project:/project
         volumes:
         - godot-build:/build
         - godot-project:/project

+        depends_on:
+        - redis

         networks:
         - backend
 volumes:
         networks:
         - backend
 volumes:

diff --git a/docker-compose.yml b/docker-compose.yml
index f13049edfa8256db88968963be01a1ac32af77d0..a4ced6593e3e251cbc4ffa2c6588ebe68311021a 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,16 +5,20 @@ services:
         volumes:
         - ./nginx/conf.d/:/etc/nginx/conf.d/
         - godot-build-dev:/build
         volumes:
         - ./nginx/conf.d/:/etc/nginx/conf.d/
         - godot-build-dev:/build

+        depends_on:
+        - redis

         ports:
         - 80:80
     redis:
         image: redis:alpine
     builder:
         build: ./builder
         ports:
         - 80:80
     redis:
         image: redis:alpine
     builder:
         build: ./builder

-        image: cjpalmer/godot-builder:0.3.0
+        image: cjpalmer/godot-builder:0.3.1

         volumes:
         - godot-build-dev:/build
         - godot-project:/project
         volumes:
         - godot-build-dev:/build
         - godot-project:/project

+        depends_on:
+        - redis

 volumes:
     godot-build-dev:
         driver: local
 volumes:
     godot-build-dev:
         driver: local