Merge pull request #26 from devicehive/development

Development

Dockerfile.plugin → Dockerfile

@@ -21,6 +21,4 @@ RUN apk update \
     && npm cache clean --force \
     && apk del .gyp
 
-VOLUME ["/usr/src/app/cassandraSchemas", "/usr/src/app/cassandraConfig"]
-
-CMD ["npm", "start"]
+CMD ["npm", "start"]

Jenkinsfile

@@ -0,0 +1,34 @@
+properties([
+  buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '32', daysToKeepStr: '', numToKeepStr: '100'))
+])
+
+def publishable_branches = ["development", "master"]
+
+node('docker') {
+  stage('Build and publish Docker images in CI repository') {
+    checkout scm
+    echo 'Building image ...'
+    def DevicehivePluginCassandraNode = docker.build('devicehiveci/devicehive-plugin-cassandra-node:${BRANCH_NAME}', '--pull -f Dockerfile .')
+
+    echo 'Pushing image to CI repository ...'
+    docker.withRegistry('https://registry.hub.docker.com', 'devicehiveci_dockerhub'){
+      DevicehivePluginCassandraNode.push()
+    }
+  }
+}
+
+if (publishable_branches.contains(env.BRANCH_NAME)) {
+  node('docker') {
+    stage('Publish image in main repository') {
+      // Builds from 'master' branch will have 'latest' tag
+      def IMAGE_TAG = (env.BRANCH_NAME == 'master') ? 'latest' : env.BRANCH_NAME
+
+      docker.withRegistry('https://registry.hub.docker.com', 'devicehiveci_dockerhub'){
+        sh """
+          docker tag devicehiveci/devicehive-plugin-cassandra-node:${BRANCH_NAME} registry.hub.docker.com/devicehive/devicehive-plugin-cassandra-node:${IMAGE_TAG}
+          docker push registry.hub.docker.com/devicehive/devicehive-plugin-cassandra-node:${IMAGE_TAG}
+        """
+      }
+    }
+  }
+}

README.md

@@ -14,10 +14,12 @@ When the message arrives it can be either a command, command update, or notifica
  1. Start DeviceHive
  2. Start Cassandra
  3. Create Cassandra keyspace
- 4. Create following .env file. **Replace username, password, plugin topic, localhost, keyspace name, cassandra username and password with your values.**
+ 4. Create following .env file. **Replace access and refresh tokens (or username and password), plugin topic, localhost, keyspace name, cassandra username and password with your values.**
 
     ENVSEPARATOR=_ <br />
-    plugin_user_login=username<br />
+    plugin_user_access_token=your.JWT.accessToken <br />
+    plugin_user_refresh_token=your.JWT.refreshToken <br />
+    plugin_user_login=username <br />
     plugin_user_password=password <br />
     plugin_plugin_topic=plugin topic <br />
     plugin_device_hive_plugin_ws_endpoint=ws://localhost:3001 <br />
@@ -45,6 +47,17 @@ When the message arrives it can be either a command, command update, or notifica
 	--------------+---------------------------------+-------------------------------------------
 	         test | 2018-02-27 17:17:27.963000+0000 | { "yourParam": "custom parameter value" }
 
+
+Note: **If you have Cassandra running in separate Docker network or without any container please specify as contact points IP of Docker container or Docker host/another machine IP instead of localhost so plugin could connect to Cassandra(cassandra_connection_contactPoints in env file)**
+
+# Manual run (without Docker)
+
+ 1. Start DeviceHive
+ 2. Start Cassandra
+ 3. Create Cassandra keyspace
+ 4. Configure your plugin and Cassandra connections with *plugin/plugin-config.json* and *cassandraConfig/config.json* (see [Configuration](#configuration))
+ 5. Execute: `npm run plugin` to create Cassandra schemas defined with JSON and to run plugin
+
 # Configuration
 ## Plugin
 Plugin part of configuration you can find [here](https://github.com/devicehive/devicehive-plugin-core-node#configuration).

docker-compose.yml

@@ -4,20 +4,22 @@ services:
   plugin:
     build:
       context: .
-      dockerfile: Dockerfile.plugin
+      dockerfile: Dockerfile
     env_file:
       - .env
     depends_on:
       - schema
     volumes:
       - ./cassandraSchemas/:/usr/src/app/cassandraSchemas:ro
       - ./cassandraConfig/:/usr/src/app/cassandraConfig:ro
+
   schema:
     build:
       context: .
-      dockerfile: Dockerfile.schema
+      dockerfile: Dockerfile
+    command: ["npm", "run", "schema"]
     env_file:
       - .env
     volumes:
       - ./cassandraSchemas/:/usr/src/app/cassandraSchemas:ro
-      - ./cassandraConfig/:/usr/src/app/cassandraConfig:ro
+      - ./cassandraConfig/:/usr/src/app/cassandraConfig:ro