added check if fetch_locales.rb exists

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

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

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