Optimiert

mc-b · Sep 5, 2018 · 083c7a0 · 083c7a0
1 parent 49eb5cb
commit 083c7a0
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 12 deletions.
diff --git a/Dockerfile.alert b/Dockerfile.alert
@@ -1,4 +1,4 @@
-FROM java:8
+FROM openjdk:8-jre-alpine
 
 LABEL "maintainer"="Marcel Bernet <marcel.bernet@ch-open.ch"
 LABEL description="IoT Alert Service"

diff --git a/Dockerfile.consumer b/Dockerfile.consumer
@@ -1,4 +1,4 @@
-FROM java:8
+FROM openjdk:8-jre-alpine
 
 LABEL "maintainer"="Marcel Bernet <marcel.bernet@ch-open.ch"
 LABEL description="IoT Consumer"

diff --git a/Dockerfile.pipe b/Dockerfile.pipe
@@ -1,4 +1,4 @@
-FROM java:8
+FROM openjdk:8-jre-alpine
 
 LABEL "maintainer"="Marcel Bernet <marcel.bernet@ch-open.ch"
 LABEL description="CSV to JSON"

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -18,9 +18,9 @@ pipeline {
         	agent any
             steps {
             		unstash 'jar'
-            		sh 'docker build -f Dockerfile.pipe -t iot-kafka-pipe .'
-            		sh 'docker build -f Dockerfile.consumer -t iot-kafka-consumer .'
-            		sh 'docker build -f Dockerfile.alert -t iot-kafka-alert .'
+            		sh 'docker build -f Dockerfile.pipe -t misegr/iot-kafka-pipe .'
+            		sh 'docker build -f Dockerfile.consumer -t misegr/iot-kafka-consumer .'
+            		sh 'docker build -f Dockerfile.alert -t misegr/iot-kafka-alert .'
             }
         }
     }

diff --git a/README.md b/README.md
@@ -14,11 +14,15 @@ Im gestarteten Maven Container:
 	cd /src
 	git clone https://github.com/mc-b/iot.kafka
 	mvn clean package
-	docker build -f Dockerfile.pipe -t iot-kafka-pipe .
-	docker build -f Dockerfile.consumer -t iot-kafka-consumer .
-	docker build -f Dockerfile.alert -t iot-kafka-alert .
 	exit
 
+Auf der Git/Bash (ausserhalb des Containers)
+
+	cd data/src/iot.kafka	
+	docker build -f Dockerfile.pipe -t misegr/iot-kafka-pipe .
+	docker build -f Dockerfile.consumer -t misegr/iot-kafka-consumer .
+	docker build -f Dockerfile.alert -t misegr/iot-kafka-alert .
+
 Auf das [IoTKit](https://github.com/mc-b/iotkitv3) ist das [MQTTPublish](https://os.mbed.com/teams/IoTKitV3/code/MQTTPublish/) Programm zu laden. Vor dem Compilieren sind die Einträge `host` und ggf. `port` anzupassen. Der `host` entspricht der IP-Adresse der VM die mittels [lernkube](https://github.com/mc-b/lernkube) erstellt wurde.
 
 ### Funktionsweise

diff --git a/iot-kafka-alert.yaml b/iot-kafka-alert.yaml
@@ -16,5 +16,5 @@ spec:
     spec:
       containers:        
       - name: iot-kafka-alert
-        image: iot-kafka-alert
+        image: misegr/iot-kafka-alert
         imagePullPolicy: IfNotPresent        
diff --git a/iot-kafka-consumer.yaml b/iot-kafka-consumer.yaml
@@ -16,5 +16,5 @@ spec:
     spec:
       containers:        
       - name: iot-kafka-consumer
-        image: iot-kafka-consumer
+        image: misegr/iot-kafka-consumer
         imagePullPolicy: IfNotPresent        
diff --git a/iot-kafka-pipe.yaml b/iot-kafka-pipe.yaml
@@ -16,5 +16,5 @@ spec:
     spec:
       containers:        
       - name: iot-kafka-pipe
-        image: iot-kafka-pipe
+        image: misegr/iot-kafka-pipe
         imagePullPolicy: IfNotPresent