You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2018/04/05 03:52:22 UTC
[3/3] ignite git commit: IGNITE-6816 Web Console: Migrated to Webpack
4. Update to NodeJS 8 in dockerfiles.
IGNITE-6816 Web Console: Migrated to Webpack 4. Update to NodeJS 8 in dockerfiles.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/26a021a0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/26a021a0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/26a021a0
Branch: refs/heads/master
Commit: 26a021a0fa235b85aa753b9b7a02370e1aa8ffaa
Parents: 28304fd
Author: Alexander Kalinin <ve...@yandex.ru>
Authored: Thu Apr 5 10:52:04 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Apr 5 10:52:04 2018 +0700
----------------------------------------------------------------------
.../docker/compose/backend/Dockerfile | 2 +-
.../docker/compose/frontend/DockerfileBuild | 2 +-
.../web-console/docker/standalone/Dockerfile | 2 +-
modules/web-console/e2e/docker-compose.yml | 2 +-
modules/web-console/e2e/testenv/Dockerfile | 2 +-
.../app/modules/agent/AgentManager.service.js | 4 +-
.../summary/summary-zipper.service.js | 2 +-
modules/web-console/frontend/package-lock.json | 5171 +++++++++++++-----
modules/web-console/frontend/package.json | 54 +-
modules/web-console/frontend/test/ci/Dockerfile | 3 +
.../frontend/webpack/webpack.common.js | 20 +-
.../frontend/webpack/webpack.dev.babel.js | 6 +-
.../frontend/webpack/webpack.prod.babel.js | 32 +-
.../frontend/webpack/webpack.test.js | 9 +-
14 files changed, 3948 insertions(+), 1363 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/26a021a0/modules/web-console/docker/compose/backend/Dockerfile
----------------------------------------------------------------------
diff --git a/modules/web-console/docker/compose/backend/Dockerfile b/modules/web-console/docker/compose/backend/Dockerfile
index e391ba4..6ae4c93 100644
--- a/modules/web-console/docker/compose/backend/Dockerfile
+++ b/modules/web-console/docker/compose/backend/Dockerfile
@@ -15,7 +15,7 @@
# limitations under the License.
#
-FROM node:6
+FROM node:8
RUN mkdir -p /opt/web-console-backend
http://git-wip-us.apache.org/repos/asf/ignite/blob/26a021a0/modules/web-console/docker/compose/frontend/DockerfileBuild
----------------------------------------------------------------------
diff --git a/modules/web-console/docker/compose/frontend/DockerfileBuild b/modules/web-console/docker/compose/frontend/DockerfileBuild
index 90c56c8..94f5244 100644
--- a/modules/web-console/docker/compose/frontend/DockerfileBuild
+++ b/modules/web-console/docker/compose/frontend/DockerfileBuild
@@ -15,7 +15,7 @@
# limitations under the License.
#
-FROM node:6
+FROM node:8
RUN mkdir -p /opt/web-console-frontend
http://git-wip-us.apache.org/repos/asf/ignite/blob/26a021a0/modules/web-console/docker/standalone/Dockerfile
----------------------------------------------------------------------
diff --git a/modules/web-console/docker/standalone/Dockerfile b/modules/web-console/docker/standalone/Dockerfile
index 30c8b32..bfb7901 100644
--- a/modules/web-console/docker/standalone/Dockerfile
+++ b/modules/web-console/docker/standalone/Dockerfile
@@ -18,7 +18,7 @@
FROM ubuntu:14.04
ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.6.0
+ENV NODE_VERSION 8.11.1
# Before package list update.
RUN set -ex && \
http://git-wip-us.apache.org/repos/asf/ignite/blob/26a021a0/modules/web-console/e2e/docker-compose.yml
----------------------------------------------------------------------
diff --git a/modules/web-console/e2e/docker-compose.yml b/modules/web-console/e2e/docker-compose.yml
index 6954891..83054cc 100644
--- a/modules/web-console/e2e/docker-compose.yml
+++ b/modules/web-console/e2e/docker-compose.yml
@@ -18,7 +18,7 @@
version: '2'
services:
mongodb:
- image: 'mongo:latest'
+ image: 'mongo:3.4'
container_name: 'mongodb'
testenv:
http://git-wip-us.apache.org/repos/asf/ignite/blob/26a021a0/modules/web-console/e2e/testenv/Dockerfile
----------------------------------------------------------------------
diff --git a/modules/web-console/e2e/testenv/Dockerfile b/modules/web-console/e2e/testenv/Dockerfile
index 0db2f29..9192e1f 100644
--- a/modules/web-console/e2e/testenv/Dockerfile
+++ b/modules/web-console/e2e/testenv/Dockerfile
@@ -18,7 +18,7 @@
FROM ubuntu:14.04
ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 8.6.0
+ENV NODE_VERSION 8.11.1
# Before package list update.
RUN set -ex && \
http://git-wip-us.apache.org/repos/asf/ignite/blob/26a021a0/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
index ca8d812..b73b2c1 100644
--- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
@@ -20,7 +20,7 @@ import {nonEmpty, nonNil} from 'app/utils/lodashMixins';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import Worker from 'worker!./decompress.worker';
+import Worker from './decompress.worker';
import SimpleWorkerPool from '../../utils/SimpleWorkerPool';
import maskNull from 'app/core/utils/maskNull';
@@ -124,7 +124,7 @@ export default class IgniteAgentManager {
.distinctUntilChanged(({ cluster }) => prevCluster === cluster)
.do(({ cluster }) => prevCluster = cluster);
- this.clusterVersion = '2.1.0';
+ this.clusterVersion = '2.4.0';
if (!this.isDemoMode()) {
this.connectionSbj.subscribe({
http://git-wip-us.apache.org/repos/asf/ignite/blob/26a021a0/modules/web-console/frontend/app/modules/states/configuration/summary/summary-zipper.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/summary/summary-zipper.service.js b/modules/web-console/frontend/app/modules/states/configuration/summary/summary-zipper.service.js
index 2f6b9e3..119fb52 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/summary/summary-zipper.service.js
+++ b/modules/web-console/frontend/app/modules/states/configuration/summary/summary-zipper.service.js
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import Worker from 'worker!./summary.worker';
+import Worker from './summary.worker';
export default ['$q', function($q) {
return function(message) {