From 40c1f6b0413148075a1a58e25b0abf35ced951dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <monotek23@gmail.com>
Date: Sat, 11 Nov 2017 11:09:43 +0100
Subject: [PATCH 1/2] added .env file with VERSION var... ...to be able to let
 compose file untouched when using another image version

---
 .env               |  3 +++
 docker-compose.yml | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 0000000..ee4e059
--- /dev/null
+++ b/.env
@@ -0,0 +1,3 @@
+# don't forget to add the minus before the version
+# it shoud look like: VERSION=-2.1.0-13
+VERSION=
diff --git a/docker-compose.yml b/docker-compose.yml
index c810843..20911e0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
   zammad-backup:
     depends_on:
       - zammad-railsserver
-    image: zammad/zammad-docker-compose:zammad-postgresql
+    image: zammad/zammad-docker-compose:zammad-postgresql${VERSION}
     labels:
       io.rancher.container.pull_image: always
     links:
@@ -18,7 +18,7 @@ services:
     command: zammad-backup
 
   zammad-elasticsearch:
-    image: zammad/zammad-docker-compose:zammad-elasticsearch
+    image: zammad/zammad-docker-compose:zammad-elasticsearch${VERSION}
     labels:
       io.rancher.container.pull_image: always
     restart: always
@@ -28,7 +28,7 @@ services:
   zammad-nginx:
     depends_on:
       - zammad-railsserver
-    image: zammad/zammad-docker-compose:zammad-nginx
+    image: zammad/zammad-docker-compose:zammad-nginx${VERSION}
     labels:
       io.rancher.container.pull_image: always
     links:
@@ -39,7 +39,7 @@ services:
       - data-zammad:/home/zammad
 
   zammad-postgresql:
-    image: zammad/zammad-docker-compose:zammad-postgresql
+    image: zammad/zammad-docker-compose:zammad-postgresql${VERSION}
     labels:
       io.rancher.container.pull_image: always
     restart: always
@@ -47,7 +47,7 @@ services:
   zammad-railsserver:
     depends_on:
       - zammad-postgresql
-    image: zammad/zammad-docker-compose:zammad
+    image: zammad/zammad-docker-compose:zammad${VERSION}
     labels:
       io.rancher.container.pull_image: always
     links:
@@ -61,7 +61,7 @@ services:
   zammad-scheduler:
     depends_on:
       - zammad-railsserver
-    image: zammad/zammad-docker-compose:zammad
+    image: zammad/zammad-docker-compose:zammad${VERSION}
     labels:
       io.rancher.container.pull_image: always
     links:
@@ -75,7 +75,7 @@ services:
   zammad-websocket:
     depends_on:
       - zammad-railsserver
-    image: zammad/zammad-docker-compose:zammad
+    image: zammad/zammad-docker-compose:zammad${VERSION}
     labels:
       io.rancher.container.pull_image: always
     links:

From 390516dac1d07ab2c06035857a4056e19129ec47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <monotek23@gmail.com>
Date: Sat, 11 Nov 2017 11:12:36 +0100
Subject: [PATCH 2/2] fixed typo

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index ee4e059..81d188a 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 # don't forget to add the minus before the version
-# it shoud look like: VERSION=-2.1.0-13
+# it should look like: VERSION=-2.1.0-13
 VERSION=