bump

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 
 WORKDIR /usr/src/app
 

docker-compose.yml

@@ -8,22 +8,15 @@ services:
     #restart: always
     ports:
       - 8080:80
-    depends_on:
-      - jaeger
 
-  fragment-simple-vue-test:
-    build: packages/fragment-simple-vue-test
-    #restart: always
+
+
 
   fragment-vue-http:
     build: packages/fragment-vue-http
     #restart: always
 
-  fragment-dotnet:
-    build: packages/fragment-dotnet
-    ports:
-      - 1231:1231
-    # restart: always
+
 
   fragment-common:
     build: packages/fragment-common
@@ -34,59 +27,3 @@ services:
   consul:
     image: consul
     # UI dać
-
-  elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.4.0
-    ports:
-      - 9200:9200
-      - 9300:9300
-    environment:
-      discovery.type: "single-node"
-      network.host: "0.0.0.0"
-
-  # running jaeger at http://localhost:16686
-  jaeger:
-    image: jaegertracing/all-in-one:latest
-    ports:
-    - "5775:5775/udp"
-    - "6831:6831/udp"
-    - "6832:6832/udp"
-    - "5778:5778"
-    - "16686:16686"
-    - "14268:14268"
-    - "9411:9411"
-    environment:
-      SPAN_STORAGE_TYPE: elasticsearch
-      ES_SERVER_URLS: http://elasticsearch:9200
-    depends_on:
-      - elasticsearch
-    restart: always
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://elasticsearch:9200"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
-
-  # running kibana at http://localhost:5601
-  kibana:
-    image: docker.elastic.co/kibana/kibana:6.4.1
-    ports:
-      - 5601:5601
-    depends_on:
-      - elasticsearch
-
-  # running grafana at http://localhost:3000
-  grafana:
-    image: grafana/grafana:5.1.0
-    ports:
-      - 3000:3000
-    depends_on:
-      - elasticsearch
-
-  # running prometheus at http://localhost:9090
-  prometheus:
-    image: prom/prometheus
-    ports:
-      - 9090:9090
-    depends_on:
-      - elasticsearch

index.js

@@ -28,7 +28,6 @@ const tailor = new Tailor({
   templatesPath: __dirname + '/templates',
 	requestFragment(url, attributes, request, span = null) {
   	const src = z.get(attributes.id);
-
 		return tailorFragment(filterReqHeadersFn)(src, attributes, request, span)
 	},
 	tracer: initTracer(
@@ -49,7 +48,6 @@ module.exports = async (request, response) => {
   error && 'do spana i zabic serwer'
 
 	Object.values(services)
-		.filter(({ Service }) => Service === 'fragment-vue-http')
 		.forEach((a) => {
 			z.set(a.Service, 'http://' + a.Address + ':' + a.Port)
 		})

packages/fragment-applications-react/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 
 WORKDIR /usr/src/app
 

packages/fragment-applications-react/package.json

@@ -6,7 +6,10 @@
   "scripts": {
     "build": "webpack --mode production",
     "watch": "webpack --watch",
-    "start": "cross-env BABEL_ENV=server micro -l tcp://0.0.0.0:80"
+    "start": "cross-env BABEL_ENV=server micro -l tcp://0.0.0.0:${npm_package_config_port}"
+  },
+  "config": {
+    "port": "80"
   },
   "author": "",
   "license": "ISC",

packages/fragment-common/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 
 WORKDIR /usr/src/app
 

packages/fragment-common/index.js

@@ -14,7 +14,7 @@ agent.service.register({
 	id: machineIdSync(),
 	name: 'fragment-common',
 	address: address(),
-	port: 80
+	port: Number(process.env.npm_package_config_port)
 })
 	.catch(() => {
 		'logowanie do spana';

packages/fragment-common/package.json

@@ -6,7 +6,10 @@
   "scripts": {
     "build": "webpack --mode production",
     "watch": "webpack --watch",
-    "start": "micro -l tcp://0.0.0.0:80"
+    "start": "micro -l tcp://0.0.0.0:${npm_package_config_port}"
+  },
+  "config": {
+    "port": "80"
   },
   "author": "",
   "license": "ISC",

packages/fragment-recommendations-vue/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 
 WORKDIR /usr/src/app
 

packages/fragment-recommendations-vue/package.json

@@ -7,7 +7,10 @@
   "scripts": {
     "build": "webpack --mode production && webpack --mode production --config webpack.server.config.js",
     "watch": "webpack --watch",
-    "start": "micro -l tcp://0.0.0.0:80"
+    "start": "micro -l tcp://0.0.0.0:${npm_package_config_port}"
+  },
+  "config": {
+    "port": "80"
   },
   "keywords": [],
   "author": "",

packages/fragment-simple-vue-test/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 
 WORKDIR /usr/src/app
 

packages/fragment-simple-vue-test/package.json

@@ -7,7 +7,10 @@
   "scripts": {
     "build": "webpack --mode production --config webpack.server.config.js",
     "watch": "webpack --watch",
-    "start": "micro -l tcp://0.0.0.0:80"
+    "start": "micro -l tcp://0.0.0.0:${npm_package_config_port}"
+  },
+  "config": {
+    "port": "80"
   },
   "keywords": [],
   "author": "",

packages/fragment-vue-http/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8
+FROM node:10
 
 WORKDIR /usr/src/app
 

packages/fragment-vue-http/index.js

@@ -15,7 +15,7 @@ agent.service.register({
 	id: machineIdSync(),
 	name: 'fragment-vue-http',
 	address: address(),
-	port: 80
+	port: Number(process.env.npm_package_config_port)
 })
 	.catch(() => {
 		'logowanie do spana';

packages/fragment-vue-http/package.json

@@ -7,7 +7,10 @@
   "scripts": {
     "build": "webpack --mode production --config webpack.server.config.js",
     "watch": "webpack --watch",
-    "start": "micro -l tcp://0.0.0.0:80"
+    "start": "micro -l tcp://0.0.0.0:${npm_package_config_port}"
+  },
+  "config": {
+    "port": "80"
   },
   "keywords": [],
   "author": "",

templates/index.html

@@ -10,14 +10,15 @@
     </style>
     <script>
         (function (d) {
+        	var i;
             require(d);
             var arr = ['react', 'react-dom', 'react-redux', 'redux', 'prop-types', 'classnames', 'vue', 'vuex', 'axios'];
             while (i = arr.pop()) (function (dep) {
                 define(dep, d, function (b) {
                     return b[dep];
                 })
             })(i);
-        }(['http://localhost:1234/dist/bundle.js']));
+        }(['TO MUSI BYC DYNAMICZNE http://localhost:1234/dist/bundle.js']));
     </script>
 </head>
 <body>