ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/4] ignite git commit: IGNITE-5536 Fixed Docker file generation.
Date Wed, 28 Jun 2017 08:46:31 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2.1.2-exchange 20c7f6c43 -> 38c209d7a


IGNITE-5536 Fixed Docker file generation.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3dbeac44
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3dbeac44
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3dbeac44

Branch: refs/heads/ignite-2.1.2-exchange
Commit: 3dbeac440591c8404bdbea78fc46cdff7c2f432e
Parents: 764eeea
Author: vsisko <vsisko@gridgain.com>
Authored: Wed Jun 28 15:07:30 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Wed Jun 28 15:07:30 2017 +0700

----------------------------------------------------------------------
 .../app/modules/configuration/generator/Docker.service.js     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3dbeac44/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
index 91457e8..ea49c41 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/Docker.service.js
@@ -19,6 +19,8 @@
  * Docker file generation entry point.
  */
 export default class IgniteDockerGenerator {
+    escapeFileName = (name) => name.replace(/[\\\/*\"\[\],\.:;|=<>?]/g, '-').replace(/
/g, '_');
+
     /**
      * Generate from section.
      *
@@ -44,7 +46,7 @@ export default class IgniteDockerGenerator {
             this.from(cluster, targetVer),
             '',
             '# Set config uri for node.',
-            `ENV CONFIG_URI config/${cluster.name}-server.xml`,
+            `ENV CONFIG_URI ${this.escapeFileName(cluster.name)}-server.xml`,
             '',
             '# Copy ignite-http-rest from optional.',
             'ENV OPTION_LIBS ignite-rest-http',
@@ -62,8 +64,7 @@ export default class IgniteDockerGenerator {
             '',
             '# Copy project jars to node classpath.',
             `RUN mkdir $IGNITE_HOME/libs/${cluster.name} && \\`,
-            `   find ${cluster.name}/target -name "*.jar" -type f -exec cp {} $IGNITE_HOME/libs/${cluster.name}
\\; && \\`,
-            `   cp -r ${cluster.name}/config/* $IGNITE_HOME/config`
+            `   find ${cluster.name}/target -name "*.jar" -type f -exec cp {} $IGNITE_HOME/libs/${cluster.name}
\\;`
         ].join('\n');
     }
 


Mime
View raw message