Merge pull request jacek-marchwicki#18 from jacek-marchwicki/travis-fix

jacek-marchwicki · jacek-marchwicki · commit fe4968f02a5c · 2016-04-22T11:20:11.000+02:00
Finding travis issues
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,18 @@ language: android
 
 android:
   components:
+    - tools
+    - platform-tools
     - build-tools-22.0.1
     - android-22
     - extra-google-m2repository
     - extra-android-m2repository
+addons:
+  apt_packages:
+    - pandoc
+
 script: ./gradlew build
+
+after_script:
+- for f in "websockets-example/build/outputs/lint-results*.html"; do pandoc $f -t plain; done
+- for f in "websockets-rxjava-example/build/outputs/lint-results*.html"; do pandoc $f -t plain; done
diff --git a/websockets-server/build-docker.sh b/websockets-server/build-docker.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t jacekmarchwicki/rx-websocket-server:v1 .
diff --git a/websockets-server/kubernates/frontend.yml b/websockets-server/kubernates/frontend.yml
@@ -0,0 +1,84 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: frontend
+  labels:
+    name: frontend
+spec:
+  ports:
+    - port: 8080
+  selector:
+    name: frontend
+---
+kind: Service
+apiVersion: v1
+metadata:
+  name: nginx-ssl-proxy
+  labels:
+    name: nginx-ssl-proxy
+spec:
+  type: LoadBalancer
+  ports:
+  - name: https
+    port: 443
+    targetPort: ssl-proxy-https
+    protocol: TCP
+  - name: http
+    port: 80
+    targetPort: ssl-proxy-http
+    protocol: TCP
+  selector:
+    name: nginx-ssl-proxy
+---
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: frontend
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        name: frontend
+    spec:
+      containers:
+      - name: rxserver
+        image: gcr.io/rx-websockets/rx-server:v2
+        command:
+        - sh
+        - -c
+        - websockets-server --host rxserver --port 8080 --stdio
+        resources:
+          requests:
+            cpu: 100m
+            memory: 100Mi
+        ports:
+        - containerPort: 8080
+---
+kind: ReplicationController
+apiVersion: v1
+metadata:
+  name: nginx-ssl-proxy
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        name: nginx-ssl-proxy
+    spec:
+      containers:
+      - name: nginx-ssl-proxy
+        image: gcr.io/cloud-solutions-images/nginx-ssl-proxy
+        command:
+        - /bin/bash
+        - /usr/bin/start.sh
+        env:
+        - name: TARGET_SERVICE
+          value: 'frontend:8080'
+        - name: ENABLE_SSL
+          value: 'false'
+        - name: ENABLE_BASIC_AUTH
+          value: 'false'
+        ports:
+        - name: ssl-proxy-http
+          containerPort: 80
diff --git a/websockets-server/run-docker.sh b/websockets-server/run-docker.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker run --rm --tty --interactive -p 8080:8080 jacekmarchwicki/rx-websocket-server:v1
diff --git a/websockets-server/upload-docker.sh b/websockets-server/upload-docker.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker push jacekmarchwicki/rx-websocket-server:v1

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/bash`
	`2`	`+`
	`3`	`+docker build -t jacekmarchwicki/rx-websocket-server:v1 .`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/bin/bash`
	`2`	`+docker run --rm --tty --interactive -p 8080:8080 jacekmarchwicki/rx-websocket-server:v1`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/bash`
	`2`	`+`
	`3`	`+docker push jacekmarchwicki/rx-websocket-server:v1`