Merge pull request #13 from AcalephStorage/release/0.1.1

Release/0.1.1

Author: madziefe

Dockerfile

@@ -1,23 +1,33 @@
-FROM node:0.12.7
-
-# Install ember, bower, forego, and caddy
-RUN npm install -g [email protected] && \
-    npm install -g [email protected]  && \
-    wget https://bin.equinox.io/c/ekMN3bCZFUn/forego-stable-linux-amd64.tgz -O /tmp/forego.tar.gz && \
-    tar xvz -C /usr/local/bin -f /tmp/forego.tar.gz && \
-    rm /tmp/forego.tar.gz && \
-    chmod 0744 /usr/local/bin/forego && \
-    wget https://github.com/mholt/caddy/releases/download/v0.7.6/caddy_linux_amd64.tar.gz -O /tmp/caddy.tar.gz && \
-    tar xvz -C /usr/local/bin -f /tmp/caddy.tar.gz && \
+FROM mhart/alpine-node:4
+
+RUN apk update && \
+    apk add git ca-certificates bash && \
+    rm -rf /var/cache/apk/*
+
+# Install forego, and caddy
+RUN wget https://github.com/mholt/caddy/releases/download/v0.8.3/caddy_linux_amd64.tar.gz -O /tmp/caddy.tar.gz && \
+    mkdir -pv /tmp/caddy && \
+    tar xvz -C /tmp/caddy -f /tmp/caddy.tar.gz && \
+    mv /tmp/caddy/caddy_linux_amd64 /usr/local/bin/caddy && \
+    rm -r /tmp/caddy && \
     rm /tmp/caddy.tar.gz
 
+# Install ember and bower
+RUN npm install -g [email protected] && \
+    npm install -g [email protected]
+
 ADD . /home/apps/kontinuous-ui
 WORKDIR /home/apps/kontinuous-ui
 
 RUN npm install && \
     bower install --allow-root
+
+ENV EMBER_ENV production
+
 ENV KUBERNETES_API_URL kubernetes.default
 ENV KUBERNETES_API_TOKEN_PATH /run/secrets/kubernetes.io/serviceaccount/token
 ENV KUBERNETES_API_TOKEN token
 
-CMD ["/usr/local/bin/forego", "start", "-f", "config/Procfile", "-p", "5000"]
+EXPOSE 5000
+
+CMD ["/home/apps/kontinuous-ui/start.sh"]

app/adapters/build.js

@@ -36,5 +36,20 @@ export default ApplicationAdapter.extend({
 
     urlParts.push(this.pathForType(modelName));
     return urlParts.join('/');
-  }
+  },
+
+  urlForQueryRecord: function(query, modelName) {
+    var urlParts = this._buildURL(modelName).split('/');
+    urlParts.removeObject(this.pathForType(modelName));
+
+    if (Ember.isPresent(query.owner) && Ember.isPresent(query.repo) && Ember.isPresent(query.build_number)) {
+      urlParts.push("pipelines", query.owner, query.repo);
+      delete query.owner;
+      delete query.repo;
+      urlParts.push(this.pathForType(modelName), query.build_number);
+      delete query.build_number;
+    }
+
+    return urlParts.join('/');
+  },
 });

app/adapters/k8s-log.js

@@ -0,0 +1,21 @@
+import ApplicationAdapter from './application';
+import Ember from 'ember';
+
+export default ApplicationAdapter.extend({
+
+  urlForQuery: function(query, modelName) {
+    var urlParts = this._buildURL(modelName).split('/');
+    urlParts.removeObject(this.pathForType(modelName));
+
+    if (Ember.isPresent(query.owner) && Ember.isPresent(query.repo) && Ember.isPresent(query.buildNumber) && Ember.isPresent(query.stageIndex)) {
+      urlParts.push('pipelines', query.owner, query.repo, 'builds', query.buildNumber, 'stages', query.stageIndex);
+      delete query.owner;
+      delete query.repo;
+      delete query.buildNumber;
+      delete query.stageIndex;
+    }
+    urlParts.push(this.pathForType(modelName));
+    return urlParts.join('/');
+  },
+
+});

app/adapters/k8s.js

@@ -3,14 +3,6 @@ import Ember from 'ember';
 
 export default ApplicationAdapter.extend({
 
-  _getLogs(query) {
-    let q = Ember.copy(query);
-    let urlParts = this.urlForQueryRecord(q).split('/');
-    urlParts.push('logs');
-    let url = urlParts.join('/');
-    return this.ajax(url, 'GET', {data: q});
-  },
-
   urlForQueryRecord: function(query, modelName) {
     var urlParts = this._buildURL(modelName).split('/');
 
@@ -23,4 +15,5 @@ export default ApplicationAdapter.extend({
     }
     return urlParts.join('/');
   },
+
 });

app/adapters/log.js

@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import DS from 'ember-data';
 import {task} from 'ember-concurrency';
 
 export default Ember.Component.extend({
@@ -20,6 +19,7 @@ export default Ember.Component.extend({
     let type = this.get('model.type');
     return this.iconClassMap[type] || this.defaultStatusIcon;
   }),
+  isRunning: Ember.computed.equal('model.status', 'RUNNING'),
 
   click() {
     this.fetchLogs();
@@ -30,89 +30,30 @@ export default Ember.Component.extend({
     let stage = this.get('model');
 
     if (Ember.isEmpty(stage.get('logFiles'))) {
-      let l = this.get('logFetcher').perform(stage);
-      stage.set('logFetcher', l);
+      let logFetcher = this.get('logFetcher').perform(stage);
+      stage.set('logFetcher', logFetcher);
+      logFetcher.then((logFiles) => {
+        stage.set('logFiles', logFiles);
+      });
     }
   },
 
   logFetcher: task(function*(stage) {
-    var promise;
-    switch(stage.get('status')) {
-      case 'RUNNING':
-        promise = this.getPodLogs(stage);
-        break;
-      case 'SUCCESS':
-      case 'FAIL':
-        promise = this.getDoneLogs(stage);
-        break;
-      default:
-        return;
+    if (stage.get('status') !== 'PENDING') {
+      let logFiles = yield this.getStageLogs(stage);
+      return logFiles;
     }
-    return yield promise.then((logFiles) => {
-      stage.set('logFiles', logFiles);
-    });
   }),
 
-  getPodLogs(stage) {
-    let namespace = stage.get('pod_namespace'),
-      podName = stage.get('pod_name');
-
-    return new Ember.RSVP.Promise((resolve) => {
-      Ember.RSVP.hash({
-        pod: this.get('store').queryRecord('k8s-pod', { namespace: namespace, name: podName })
-      })
-      .then((hash) => {
-        let containers = hash.pod.get('spec.containers').getEach('name');
-        let logs = [];
-
-        containers.forEach((name) => {
-          let q = { namespace: namespace, podName: podName, container: name };
-          let store = this.get('store');
-          let log = DS.PromiseObject.create({
-            promise: store.queryRecord('k8s-log', q)
-          });
-
-          log.reopen({
-            title: name,
-            reloader: task(function*() {
-              yield store.queryRecord('log', q)
-                .then((l) => {
-                  log.set('details', l.get('details'));
-                });
-            }).drop()
-          });
-
-          logs.push(log);
-        });
-        resolve(logs);
-      }, () => {
-        resolve([]);
-      });
-    });
-  },
-
-  getDoneLogs(stage) {
-    let adapter = this.get('store').adapterFor('stage'),
-      query = {
-        owner: this.get('pipeline.owner'),
-        repo: this.get('pipeline.repo'),
-        buildNumber: this.get('build.number'),
-        stageIndex: stage.get('index')
-      };
+  getStageLogs(stage) {
+    let query = {
+      owner: this.get('pipeline.owner'),
+      repo: this.get('pipeline.repo'),
+      buildNumber: this.get('build.number'),
+      stageIndex: stage.get('index'),
+    };
 
-    return new Ember.RSVP.Promise((resolve) => {
-      adapter._getLogs(query)
-        .then((logFiles) => {
-          logFiles.forEach((logFile) => {
-            let filename = logFile.filename.split('/');
-            logFile.title = filename.objectAt(filename.length - 1);
-            logFile.details = atob(logFile.content);
-          });
-          resolve(logFiles);
-        }, () => {
-          resolve([]);
-        });
-    });
+    return this.get('store').query('log', query);
   },
 
 });

app/adapters/pod.js

@@ -2,7 +2,7 @@ import Ember from 'ember';
 
 export default Ember.Component.extend({
 
-  classNames: Ember.String.w('ui borderless menu main-menu'),
+  classNames: Ember.String.w('ui borderless attached menu main-menu'),
 
   session: Ember.inject.service(),
   appNamespace: Ember.inject.service(),