From 0a0c983cfb0c16a8395fa2b126210bf351836b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 9 Jan 2017 15:52:53 +0100
Subject: [PATCH] added check if fetch_locales.rb exists

---
 docker-compose-build.yml | 18 +++++++++++-------
 docker-compose.yml       | 14 +++++++++-----
 install-zammad.sh        |  2 +-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/docker-compose-build.yml b/docker-compose-build.yml
index 677e015..009a20b 100644
--- a/docker-compose-build.yml
+++ b/docker-compose-build.yml
@@ -4,32 +4,36 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.elasticsearch
+    restart: always
   nginx:
     build:
       context: .
       dockerfile: Dockerfile.nginx
-    ports:
-      - "80:80"
-    links:
-      - zammad
     depends_on:
       - zammad
+    links:
+      - zammad
+    ports:
+      - "80:80"
+    restart: always
     volumes:
       - data-zammad:/home/zammad
   postgresql:
     build:
       context: .
       dockerfile: Dockerfile.postgresql
+    restart: always
   zammad:
     build:
       context: .
       dockerfile: Dockerfile.zammad
-    links:
-      - postgresql
-      - elasticsearch
     depends_on:
       - postgresql
       - elasticsearch
+    links:
+      - postgresql
+      - elasticsearch
+    restart: always
     volumes:
       - data-zammad:/home/zammad
       - data-ruby:/usr/local
diff --git a/docker-compose.yml b/docker-compose.yml
index 2cae7e8..3e42d6f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,18 +2,21 @@ version: '2'
 services:
   elasticsearch:
     image: zammad/zammad-docker-compose:elasticsearch
+    restart: always
   nginx:
-    image: zammad/zammad-docker-compose:nginx
-    ports:
-      - "80:80"
-    links:
-      - zammad
     depends_on:
       - zammad
+    image: zammad/zammad-docker-compose:nginx
+    links:
+      - zammad
+    ports:
+      - "80:80"
+    restart: always
     volumes:
       - data-zammad:/home/zammad
   postgresql:
     image: zammad/zammad-docker-compose:postgresql
+    restart: always
   zammad:
     image: zammad/zammad-docker-compose:zammad
     links:
@@ -22,6 +25,7 @@ services:
     depends_on:
       - postgresql
       - elasticsearch
+    restart: always
     volumes:
       - data-zammad:/home/zammad
       - data-ruby:/usr/local
diff --git a/install-zammad.sh b/install-zammad.sh
index 79a90d8..388c6a2 100644
--- a/install-zammad.sh
+++ b/install-zammad.sh
@@ -9,7 +9,7 @@ cp -R /tmp/zammad/.[!.]* ${ZAMMAD_DIR}
 cd ${ZAMMAD_DIR}
 rm -rf /tmp/zammad
 bundle install --without test development mysql
-contrib/packager.io/fetch_locales.rb
+test -f contrib/packager.io/fetch_locales.rb && contrib/packager.io/fetch_locales.rb
 sed -e 's#.*adapter: postgresql#  adapter: nulldb#g' -e 's#.*username:.*#  username: postgres#g' -e 's#.*password:.*#  password: \n  host: postgresql\n#g' < config/database.yml.pkgr > config/database.yml
 bundle exec rake assets:precompile
 sed -e 's#.*adapter: postgresql#  adapter: postgresql#g' -e 's#.*username:.*#  username: postgres#g' -e 's#.*password:.*#  password: \n  host: postgresql\n#g' < config/database.yml.pkgr > config/database.yml