From f24395f07411857fe84691dc96c19b4467b68971 Mon Sep 17 00:00:00 2001
From: Juan <juan@pc-juan.verdnatura.es>
Date: Tue, 12 Jun 2018 11:24:43 +0200
Subject: [PATCH] Lavels to compose services

---
 Dockerfile             |  5 -----
 docker-compose.tpl.yml |  4 +---
 gulpfile.js            | 33 +++++++++++++++++++++------------
 services/.gitignore    |  3 +--
 services/.yo-rc.json   |  3 ---
 5 files changed, 23 insertions(+), 25 deletions(-)
 delete mode 100644 Dockerfile
 delete mode 100644 services/.yo-rc.json

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 3018fe2d13..0000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM vn-loopback:latest
-
-COPY . /app
-WORKDIR /app
-CMD ["pm2-docker", "./server/server.js"]
diff --git a/docker-compose.tpl.yml b/docker-compose.tpl.yml
index 5784345e0f..fa467795a1 100644
--- a/docker-compose.tpl.yml
+++ b/docker-compose.tpl.yml
@@ -1,12 +1,10 @@
 version: '2'
 services:
     nginx:
-        container_name: "${BRANCH_NAME}-nginx"
-        image: "nginx:${BUILD_NUMBER}"
         privileged: true
         build:
             context: ./services/nginx
         ports:
             - "80:80"
-        mem_limit: 200m
+        mem_limit: 200m,
         links: []
diff --git a/gulpfile.js b/gulpfile.js
index 1b24a105df..37bce1099b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -163,35 +163,44 @@ gulp.task('docker-compose', async () => {
 
     for (let service of services) {
         let dockerFile = `Dockerfile`;
-        let containerName = `${namePrefix}${service.name}`;
-
         let localDockerFile = `${__dirname}/services/${service.name}/Dockerfile`;
 
         if (await fs.exists(localDockerFile))
             dockerFile = localDockerFile;
 
         composeYml.services[service.name] = {
-            container_name: containerName,
-            image: `${service.name}:${imageTag}`,
             volumes: ['/config:/config'],
             build: {
                 context: `./services`,
                 dockerfile: dockerFile
             },
             ports: [`${service.port}:${defaultPort}`],
-            environment: [
-                'NODE_ENV=${NODE_ENV}',
-                'salixHost=${salixHost}',
-                'salixPort=${salixPort}',
-                'salixUser=${salixUser}',
-                'salixPassword=${salixPassword}'
-            ]
+            environment: {
+                NODE_ENV: '${NODE_ENV}',
+                salixHost: '${salixHost}',
+                salixPort: '${salixPort}',
+                salixUser: '${salixUser}',
+                salixPassword: '${salixPassword}'
+            }
         };
+
         composeYml.services.nginx.links.push(
-            `${service.name}:${containerName}`
+            `${service.name}:${namePrefix}${service.name}`
         );
     }
 
+    for (let serviceName in composeYml.services) {
+        let service = composeYml.services[serviceName];
+        let data = {
+            container_name: `${namePrefix}${serviceName}`,
+            image: `${serviceName}:${imageTag}`,
+            labels: {
+                'salix.tag': imageTag
+            }
+        };
+        Object.assign(service, data);
+    }
+
     let ymlString = yaml.safeDump(composeYml);
     await fs.writeFile('./docker-compose.yml', ymlString);
 });
diff --git a/services/.gitignore b/services/.gitignore
index 9792c4ca5d..0d44de9940 100644
--- a/services/.gitignore
+++ b/services/.gitignore
@@ -1,3 +1,2 @@
-datasources.test.json
-datasources.development.json
+datasources.*.json
 db.json
diff --git a/services/.yo-rc.json b/services/.yo-rc.json
deleted file mode 100644
index 02f3fc17be..0000000000
--- a/services/.yo-rc.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "generator-loopback": {}
-}
\ No newline at end of file