move images to openiap org

Author: skadefro

OpenFlow/src/Config.ts

@@ -96,7 +96,7 @@ export class Config {
         Config.downloadtoken_expires_in = Config.getEnv("downloadtoken_expires_in", "15m");
         Config.personalnoderedtoken_expires_in = Config.getEnv("personalnoderedtoken_expires_in", "365d");
 
-        Config.nodered_image = Config.getEnv("nodered_image", "cloudhack/openflownodered:edge");
+        Config.nodered_image = Config.getEnv("nodered_image", "openiap/openflownodered:edge");
         Config.saml_federation_metadata = Config.getEnv("saml_federation_metadata", "");
         Config.api_ws_url = Config.getEnv("api_ws_url", "ws://localhost:3000");
         Config.namespace = Config.getEnv("namespace", ""); // also sent to website 
@@ -184,7 +184,7 @@ export class Config {
     public static downloadtoken_expires_in: string = Config.getEnv("downloadtoken_expires_in", "15m");
     public static personalnoderedtoken_expires_in: string = Config.getEnv("personalnoderedtoken_expires_in", "365d");
 
-    public static nodered_image: string = Config.getEnv("nodered_image", "cloudhack/openflownodered:edge");
+    public static nodered_image: string = Config.getEnv("nodered_image", "openiap/openflownodered:edge");
     public static saml_federation_metadata: string = Config.getEnv("saml_federation_metadata", "");
     public static api_ws_url: string = Config.getEnv("api_ws_url", "ws://localhost:3000");
     public static namespace: string = Config.getEnv("namespace", ""); // also sent to website 

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/nodered",
-  "version": "1.1.109",
+  "version": "1.1.110",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

VERSION

@@ -1 +1 @@
-1.1.109
+1.1.110

docker-compose-toolbox.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`toolbox.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:1.1.109"
+    image: "openiap/openflow:1.1.110"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.toolbox.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.109"
+    image: "openiap/openflownodered:1.1.110"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik-letsencrypt.yml

@@ -69,7 +69,7 @@ services:
       - "traefik.http.routers.web.entrypoints=web,websecure"
       - "traefik.frontend.passHostHeader=true"
       - "traefik.http.routers.web.tls.certresolver=myresolver"
-    image: "cloudhack/openflow:1.1.109"
+    image: "openiap/openflow:1.1.110"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -107,7 +107,7 @@ services:
       - "traefik.http.routers.nodered.entrypoints=web,websecure"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
       - "traefik.http.routers.nodered.tls.certresolver=myresolver"
-    image: "cloudhack/openflownodered:1.1.109"
+    image: "openiap/openflownodered:1.1.110"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`localhost.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:1.1.109"
+    image: "openiap/openflow:1.1.110"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.109"
+    image: "openiap/openflownodered:1.1.110"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - "5672:5672"
       - "15672:15672"
   web:
-    image: "cloudhack/openflow:1.1.109"
+    image: "openiap/openflow:1.1.110"
     environment:
       - update_acl_based_on_groups=true
       - multi_tenant=false
@@ -52,7 +52,7 @@ services:
       - "80:80"
       - "5858:5858"
   nodered:
-    image: "cloudhack/openflownodered:1.1.109"
+    image: "openiap/openflownodered:1.1.110"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1

gulpfile.js

@@ -44,14 +44,6 @@ gulp.task("browserify", function () {
     return bfi;
 });
 
-//  package.json -> scripts ->     "prepare": "gulp clean"
-
-// gulp.task("clean", shell.task([
-//     'echo "delete npmrc and cache"',
-//     'if exist "OpenFlowNodeRED\\dist\\nodered\\.npmrc" del OpenFlowNodeRED\\dist\\nodered\\.npmrc',
-//     'if exist "OpenFlowNodeRED\\dist\\.cache" rmdir OpenFlowNodeRED\\dist\\.cache /s /q '
-// ]));
-
 gulp.task("compose", shell.task([
     'echo "delete npmrc and cache"',
     'if exist "OpenFlowNodeRED\\dist\\nodered\\.npmrc" del OpenFlowNodeRED\\dist\\nodered\\.npmrc',
@@ -62,69 +54,52 @@ gulp.task("compose", shell.task([
     'cd OpenFlowNodeRED && tsc -p tsconfig.json',
     'echo "compile OpenFlow"',
     'tsc -p OpenFlow/tsconfig.json',
-    'echo "Build cloudhack/openflownodered"',
-    'cd OpenFlowNodeRED && docker build -t cloudhack/openflownodered:edge .',
-    'docker tag cloudhack/openflownodered:edge cloudhack/openflownodered:' + version,
-    'echo "Push cloudhack/openflownodered"',
-    'docker push cloudhack/openflownodered:edge',       //'docker push cloudhack/openflownodered:' + version,
-    'docker push cloudhack/openflownodered:' + version,       //'docker push cloudhack/openflownodered:' + version,
-    'echo "Build cloudhack/openflow"',
-    'docker build -t cloudhack/openflow:edge .',
-    'docker tag cloudhack/openflow:edge cloudhack/openflow:' + version,
-    'echo "Push cloudhack/openflow"',
-    'docker push cloudhack/openflow:edge',
-    'docker push cloudhack/openflow:' + version
+    'echo "Build openiap/nodered"',
+    'cd OpenFlowNodeRED && docker build -t openiap/nodered:edge .',
+    'docker tag openiap/nodered:edge openiap/nodered:' + version,
+    'echo "Push openiap/nodered"',
+    'docker push openiap/nodered:edge',       //'docker push openiap/nodered:' + version,
+    'docker push openiap/nodered:' + version,       //'docker push openiap/nodered:' + version,
+    'echo "Build openiap/openflow"',
+    'docker build -t openiap/openflow:edge .',
+    'docker tag openiap/openflow:edge openiap/openflow:' + version,
+    'echo "Push openiap/openflow"',
+    'docker push openiap/openflow:edge',
+    'docker push openiap/openflow:' + version
 ]));
 
-// gulp.task("build", shell.task([
-//     'gulp copyfiles1',
-//     'echo "compile OpenFlowNodeRED"',
-//     'cd OpenFlowNodeRED && tsc -p tsconfig.json',
-//     'echo "compile OpenFlow"',
-//     'npx webpack',
-//     'tsc -p OpenFlow/tsconfig.json'
-// ]));
-
-// gulp.task("pushopenflow", shell.task([
-//     'gulp copyfiles1',
-//     'echo "compile OpenFlowNodeRED"',
-//     'cd OpenFlowNodeRED && tsc -p tsconfig.json',
-//     'echo "compile OpenFlow"',
-//     'npx webpack',
-//     'tsc -p OpenFlow/tsconfig.json'
-// ]));
 
 gulp.task("bumpyml1", function () {
     return gulp.src(["./*.yml"]).pipe(replace(/openflow:\d+(\.\d+)+/g, 'openflow:' + version)).
         pipe(gulp.dest("./"));
 });
 gulp.task("bumpyml2", function () {
-    return nodered = gulp.src(["./*.yml"]).pipe(replace(/openflownodered:\d+(\.\d+)+/g, 'openflownodered:' + version)).
+    return nodered = gulp.src(["./*.yml"]).pipe(replace(/nodered:\d+(\.\d+)+/g, 'nodered:' + version)).
         pipe(gulp.dest("./"));
 });
 gulp.task("bumpflow", function () {
-    console.log('cloudhack/openflow:' + version);
+    console.log('openiap/openflow:' + version);
     return gulp.src(["config/**/controllers.yml"])
         .pipe(replace(/openflow:\d+(\.\d+)+/g, 'openflow:' + version))
         .pipe(gulp.dest("config"));
 });
 gulp.task("bumpnodered", function () {
-    console.log('cloudhack/openflownodered:' + version);
+    console.log('openiap/nodered:' + version);
     return gulp.src(["config/**/controllers.yml"])
-        .pipe(replace(/openflownodered:\d+(\.\d+)+/g, 'openflownodered:' + version))
+        .pipe(replace(/nodered:\d+(\.\d+)+/g, 'nodered:' + version))
         .pipe(gulp.dest("config"));
 });
 gulp.task("bumpconfigmap", function () {
-    console.log('cloudhack/openflownodered:' + version);
+    console.log('openiap/nodered:' + version);
     return gulp.src(["config/**/configmap.yml"])
-        .pipe(replace(/openflownodered:\d+(\.\d+)+/g, 'openflownodered:' + version))
+        .pipe(replace(/nodered:\d+(\.\d+)+/g, 'nodered:' + version))
         .pipe(gulp.dest("config"));
 });
 
 gulp.task("bumpaiotfrontend", function () {
     let version = "0.0.1";
     version = fs.readFileSync("../aiot-frontend/VERSION", "utf8");
-    console.log('cloudhack/aiot-frontend:' + version);
+    console.log('openiap/aiot-frontend:' + version);
     return gulp.src(["config/**/controllers.yml"])
         .pipe(replace(/aiot-frontend:\d+(\.\d+)+/g, 'aiot-frontend:' + version))
         .pipe(gulp.dest("config"));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openiap/openflow",
-  "version": "1.1.109",
+  "version": "1.1.110",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {