Merge branch 'dev' of http://git.verdnatura.es/salix into dev

This commit is contained in:
Carlos Jimenez 2018-02-07 15:06:40 +01:00
commit 3eed1e2124
1 changed files with 3 additions and 3 deletions

View File

@ -118,10 +118,10 @@ gulp.task('docker-compose', async () => {
let services = await getServices();
for (let service of services) {
let dockerFile = `${__dirname}/Dockerfile`;
let dockerFile = `${__dirname}/${service.name}/Dockerfile`;
if (await fs.exists(`./services/${service.name}/Dockerfile`))
dockerFile = 'Dockerfile';
// if (await fs.exists(`./services/${service.name}/Dockerfile`))
// dockerFile = 'Dockerfile';
composeYml.services[service.name] = {
environment: ['NODE_ENV=${NODE_ENV}'],