From dd7baee00112bff140a81041ee819d0655dea95d Mon Sep 17 00:00:00 2001 From: Xiaolu Chen Date: Thu, 25 Jan 2018 17:16:44 +0800 Subject: [PATCH 01/16] fae --- .../java/com/example/demo/web/controller/IndexController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/web/controller/IndexController.java b/src/main/java/com/example/demo/web/controller/IndexController.java index 15aa81d..65c6069 100644 --- a/src/main/java/com/example/demo/web/controller/IndexController.java +++ b/src/main/java/com/example/demo/web/controller/IndexController.java @@ -19,7 +19,7 @@ public class IndexController { @GetMapping("") public JSONObject hello(String name) { JSONObject jsonObject = new JSONObject(); - jsonObject.put("random", RandomStringUtils.randomAlphabetic(16)); + jsonObject.put("random11", RandomStringUtils.randomAlphabetic(16)); if (StringUtils.isNotBlank(name)) { jsonObject.put("welcome", "hello, " + name + "!"); } From 2666dbe67d3bf2c10d8ceba13eeacc3588ebb65c Mon Sep 17 00:00:00 2001 From: Xiaolu Chen Date: Fri, 26 Jan 2018 14:10:28 +0800 Subject: [PATCH 02/16] a little --- .../java/com/example/demo/web/controller/IndexController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/web/controller/IndexController.java b/src/main/java/com/example/demo/web/controller/IndexController.java index 65c6069..725b2b8 100644 --- a/src/main/java/com/example/demo/web/controller/IndexController.java +++ b/src/main/java/com/example/demo/web/controller/IndexController.java @@ -24,7 +24,7 @@ public JSONObject hello(String name) { jsonObject.put("welcome", "hello, " + name + "!"); } jsonObject.put("welcome1", "1"); - jsonObject.put("welcome2", "2"); + jsonObject.put("welcome3", "3"); logger.info("result msg: {}", jsonObject.toJSONString()); return jsonObject; } From 2827cc2357105bb6527a3d8b22d4934f8505b97c Mon Sep 17 00:00:00 2001 From: Xiaolu Chen Date: Tue, 30 Jan 2018 10:17:35 +0800 Subject: [PATCH 03/16] no message --- .../java/com/example/demo/web/controller/IndexController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/web/controller/IndexController.java b/src/main/java/com/example/demo/web/controller/IndexController.java index 725b2b8..471deec 100644 --- a/src/main/java/com/example/demo/web/controller/IndexController.java +++ b/src/main/java/com/example/demo/web/controller/IndexController.java @@ -24,7 +24,7 @@ public JSONObject hello(String name) { jsonObject.put("welcome", "hello, " + name + "!"); } jsonObject.put("welcome1", "1"); - jsonObject.put("welcome3", "3"); + jsonObject.put("welcome4", "4"); logger.info("result msg: {}", jsonObject.toJSONString()); return jsonObject; } From 6bd6129f43cef8275be35ad438d39ae3e1ced0eb Mon Sep 17 00:00:00 2001 From: Xiaolu Chen Date: Tue, 30 Jan 2018 10:37:13 +0800 Subject: [PATCH 04/16] no message --- .../java/com/example/demo/web/controller/IndexController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/web/controller/IndexController.java b/src/main/java/com/example/demo/web/controller/IndexController.java index 471deec..36d9393 100644 --- a/src/main/java/com/example/demo/web/controller/IndexController.java +++ b/src/main/java/com/example/demo/web/controller/IndexController.java @@ -24,7 +24,7 @@ public JSONObject hello(String name) { jsonObject.put("welcome", "hello, " + name + "!"); } jsonObject.put("welcome1", "1"); - jsonObject.put("welcome4", "4"); + jsonObject.put("welcome5", "5"); logger.info("result msg: {}", jsonObject.toJSONString()); return jsonObject; } From 065b5477d54fcf96c25324ebcba688d794cf9f47 Mon Sep 17 00:00:00 2001 From: Xiaolu Chen Date: Tue, 30 Jan 2018 10:48:39 +0800 Subject: [PATCH 05/16] no message --- .../java/com/example/demo/web/controller/IndexController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/web/controller/IndexController.java b/src/main/java/com/example/demo/web/controller/IndexController.java index 36d9393..e6c82b7 100644 --- a/src/main/java/com/example/demo/web/controller/IndexController.java +++ b/src/main/java/com/example/demo/web/controller/IndexController.java @@ -24,7 +24,7 @@ public JSONObject hello(String name) { jsonObject.put("welcome", "hello, " + name + "!"); } jsonObject.put("welcome1", "1"); - jsonObject.put("welcome5", "5"); + jsonObject.put("welcome6", "6"); logger.info("result msg: {}", jsonObject.toJSONString()); return jsonObject; } From 195fec348fcec91d90b63ca81dc89f6573388f49 Mon Sep 17 00:00:00 2001 From: solochen84 <276573129@qq.com> Date: Wed, 19 Sep 2018 23:41:02 +0800 Subject: [PATCH 06/16] Create Dockerfile --- Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..12a66d2 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM ubuntu:16.04 +MAINTAINER modian(1050215723@qq.com) +ARG app +ARG jdkdir +ADD $jdkdir /usr/local/jdk8 +ENV JAVA_HOME /usr/local/jdk8/jdk1.8.0_181 +ENV JRE_HOME $JAVA_HOME/jre +ENV CLASSPATH :$JAVA_HOME/lib:$JRE_HOME/lib +ENV PATH $PATH:$JAVA_HOME/bin +ADD $app app.jar +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] From abcec7b0c5991a9e846cd1b3cde63263ba526568 Mon Sep 17 00:00:00 2001 From: solochen84 <276573129@qq.com> Date: Thu, 20 Sep 2018 00:48:24 +0800 Subject: [PATCH 07/16] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 12a66d2..7c29c2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ FROM ubuntu:16.04 -MAINTAINER modian(1050215723@qq.com) ARG app ARG jdkdir ADD $jdkdir /usr/local/jdk8 From 9e218f01bb6b81d036579252d32ecc18ae382212 Mon Sep 17 00:00:00 2001 From: solochen84 <276573129@qq.com> Date: Thu, 20 Sep 2018 01:59:20 +0800 Subject: [PATCH 08/16] Update Dockerfile --- Dockerfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7c29c2a..cd902d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,3 @@ -FROM ubuntu:16.04 -ARG app -ARG jdkdir -ADD $jdkdir /usr/local/jdk8 -ENV JAVA_HOME /usr/local/jdk8/jdk1.8.0_181 -ENV JRE_HOME $JAVA_HOME/jre -ENV CLASSPATH :$JAVA_HOME/lib:$JRE_HOME/lib -ENV PATH $PATH:$JAVA_HOME/bin +FROM registry-scu.cloudtogo.cn/ubuntu:jdk ADD $app app.jar ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] From 4f4381cd0bcf528420bfbfdd7d065469414a79ce Mon Sep 17 00:00:00 2001 From: solochen84 <276573129@qq.com> Date: Thu, 20 Sep 2018 02:45:25 +0800 Subject: [PATCH 09/16] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index cd902d1..b5efc61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ FROM registry-scu.cloudtogo.cn/ubuntu:jdk +ARG app ADD $app app.jar ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] From c6a5ec8da7a056b3e3896d71ca4294c952eafb07 Mon Sep 17 00:00:00 2001 From: solochen84 <276573129@qq.com> Date: Tue, 25 Sep 2018 16:17:23 +0800 Subject: [PATCH 10/16] Create kube.yaml --- kube.yaml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 kube.yaml diff --git a/kube.yaml b/kube.yaml new file mode 100644 index 0000000..d9f1d98 --- /dev/null +++ b/kube.yaml @@ -0,0 +1,33 @@ +apiVersion: v1 +kind: Service +metadata: + name: maven01-service +spec: + type: NodePort + ports: + - name: maven01 + port: 19090 + targetPort: 8080 + protocol: TCP + selector: + app: maven01 +--- +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: maven01-deployment +spec: + replicas: 3 + template: + metadata: + labels: + app: maven01 + spec: + containers: + - name: maven01 + image: registry-scu.cloudtogo.cn/maven01:latest + ports: + - containerPort: 8080 + env: + - name: key + value: "value" From 77e7f020d51ec56e71e1c4251857179171c649e2 Mon Sep 17 00:00:00 2001 From: solochen84 <276573129@qq.com> Date: Mon, 5 Nov 2018 18:43:04 +0800 Subject: [PATCH 11/16] Update kube.yaml --- kube.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kube.yaml b/kube.yaml index d9f1d98..5921789 100644 --- a/kube.yaml +++ b/kube.yaml @@ -1,31 +1,31 @@ apiVersion: v1 kind: Service metadata: - name: maven01-service + name: maven-service spec: type: NodePort ports: - - name: maven01 + - name: maven port: 19090 targetPort: 8080 protocol: TCP selector: - app: maven01 + app: maven --- apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: maven01-deployment + name: maven-deployment spec: - replicas: 3 + replicas: 1 template: metadata: labels: - app: maven01 + app: maven spec: containers: - - name: maven01 - image: registry-scu.cloudtogo.cn/maven01:latest + - name: maven + image: registry-scu.cloudtogo.cn/maven:latest ports: - containerPort: 8080 env: From fb616e2982a91ebaa939304faaa09ff255eb9721 Mon Sep 17 00:00:00 2001 From: solochen84 <276573129@qq.com> Date: Mon, 5 Nov 2018 18:48:57 +0800 Subject: [PATCH 12/16] Update kube.yaml --- kube.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kube.yaml b/kube.yaml index 5921789..3208d4c 100644 --- a/kube.yaml +++ b/kube.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: maven - image: registry-scu.cloudtogo.cn/maven:latest + image: 10.10.10.71:5000/maven:latest ports: - containerPort: 8080 env: From 85aac9d9dc25a356d27ac2e44f92e8ce58bd1e5f Mon Sep 17 00:00:00 2001 From: solochen84 <276573129@qq.com> Date: Mon, 5 Nov 2018 19:37:09 +0800 Subject: [PATCH 13/16] Update kube.yaml --- kube.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kube.yaml b/kube.yaml index 3208d4c..1c544a8 100644 --- a/kube.yaml +++ b/kube.yaml @@ -6,8 +6,8 @@ spec: type: NodePort ports: - name: maven - port: 19090 - targetPort: 8080 + port: 8080 + nodePort: 31002 protocol: TCP selector: app: maven From 0752132ccb9bd6963fb41c3700220b93a00057bc Mon Sep 17 00:00:00 2001 From: solochen84 <276573129@qq.com> Date: Mon, 5 Nov 2018 19:43:02 +0800 Subject: [PATCH 14/16] Update kube.yaml --- kube.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/kube.yaml b/kube.yaml index 1c544a8..2982c5d 100644 --- a/kube.yaml +++ b/kube.yaml @@ -8,6 +8,7 @@ spec: - name: maven port: 8080 nodePort: 31002 + targetPort: 8080 protocol: TCP selector: app: maven From bec173a0e24130411eca3604c4abc2758b983963 Mon Sep 17 00:00:00 2001 From: solochen84 <276573129@qq.com> Date: Sun, 16 Dec 2018 21:36:17 +0800 Subject: [PATCH 15/16] Update kube.yaml --- kube.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kube.yaml b/kube.yaml index 2982c5d..a5fe441 100644 --- a/kube.yaml +++ b/kube.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: maven - image: 10.10.10.71:5000/maven:latest + image: 192.168.0.112:5000/maven:latest ports: - containerPort: 8080 env: From 443cab4f7ef2123f9c417a54c77338ac3c6fb146 Mon Sep 17 00:00:00 2001 From: solochen84 <276573129@qq.com> Date: Tue, 15 Jan 2019 22:07:15 +0800 Subject: [PATCH 16/16] Update kube.yaml --- kube.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kube.yaml b/kube.yaml index a5fe441..80281a2 100644 --- a/kube.yaml +++ b/kube.yaml @@ -26,7 +26,7 @@ spec: spec: containers: - name: maven - image: 192.168.0.112:5000/maven:latest + image: 192.168.0.108:5000/maven:latest ports: - containerPort: 8080 env: