From c93cedf7ffd6a4e88bc70911b97ef8e532cd2e0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=BA=E5=8A=9B?= <1879324764@qq.com>
Date: Mon, 31 May 2021 15:27:06 +0800
Subject: [PATCH 1/3] modify docker-compose.yaml for config in root

---
 docker-compose-ha.yaml | 50 +++++++++++++++++++++---------------------
 docker-compose.yaml    | 20 ++++++++---------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/docker-compose-ha.yaml b/docker-compose-ha.yaml
index f2203a6..70204da 100644
--- a/docker-compose-ha.yaml
+++ b/docker-compose-ha.yaml
@@ -1,25 +1,25 @@
-version: '3.8'
-
-services:
-  koodera:
-    build: .
-    expose:
-      - 8080
-  kooderb:
-    build: .
-    expose:
-      - 8080
-
-  haproxy:
-    image: haproxy:1.6
-    volumes:
-      - ./core/src/main/resources/kooder.properties:/root/core/src/main/resources/kooder.properties:ro
-      - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro
-    links:
-      - koodera
-      - kooderb
-    ports:
-      - "8080:8080"
-
-
-
+version: '3.8'
+
+services:
+  koodera:
+    image: registry.cn-hangzhou.aliyuncs.com/devops_hu/kooder:v1.0.0
+    expose:
+      - 8080
+  kooderb:
+    build: .
+    expose:
+      - 8080
+
+  haproxy:
+    image: haproxy:1.6
+    volumes:
+      - ./kooder.properties:/root/core/src/main/resources/kooder.properties
+      - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
+    links:
+      - koodera
+      - kooderb
+    ports:
+      - "8080:8080"
+
+
+
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8b18ff5..f19cefa 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,10 +1,10 @@
-version: '3.8'
-
-services:
-  kooder:
-    build: .
-    container_name: kooder
-    volumes:
-      - ./core/src/main/resources/kooder.properties:/root/core/src/main/resources/kooder.properties:ro
-    ports:
-      - 8080:8080
\ No newline at end of file
+version: '3.8'
+
+services:
+  kooder:
+    image: registry.cn-hangzhou.aliyuncs.com/devops_hu/kooder:v1.0.0
+    container_name: kooder
+    volumes:
+      - ./kooder.properties:/root/core/src/main/resources/kooder.properties
+    ports:
+      - 8080:8080
-- 
Gitee


From 1a905b2bea1adab50613ee6303ad2f671615e237 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=BA=E5=8A=9B?= <1879324764@qq.com>
Date: Mon, 31 May 2021 15:32:09 +0800
Subject: [PATCH 2/3] add volumes ro commit

---
 docker-compose-ha.yaml | 4 ++--
 docker-compose.yaml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose-ha.yaml b/docker-compose-ha.yaml
index 70204da..c75301a 100644
--- a/docker-compose-ha.yaml
+++ b/docker-compose-ha.yaml
@@ -13,8 +13,8 @@ services:
   haproxy:
     image: haproxy:1.6
     volumes:
-      - ./kooder.properties:/root/core/src/main/resources/kooder.properties
-      - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
+      - ./kooder.properties:/root/core/src/main/resources/kooder.properties:ro
+      - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro
     links:
       - koodera
       - kooderb
diff --git a/docker-compose.yaml b/docker-compose.yaml
index f19cefa..5b4d879 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,6 +5,6 @@ services:
     image: registry.cn-hangzhou.aliyuncs.com/devops_hu/kooder:v1.0.0
     container_name: kooder
     volumes:
-      - ./kooder.properties:/root/core/src/main/resources/kooder.properties
+      - ./kooder.properties:/root/core/src/main/resources/kooder.properties:ro
     ports:
       - 8080:8080
-- 
Gitee


From f2222552a9bc70d7f944f1d39a07fbec114c951e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=BA=E5=8A=9B?= <1879324764@qq.com>
Date: Mon, 31 May 2021 15:37:05 +0800
Subject: [PATCH 3/3] modify Dockerfile and docker-compose.yml file for config
 in root

---
 Dockerfile           | 27 ++++++++++++++-------------
 docker-entrypoint.sh |  3 +--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 25234cd..1aa763f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,14 @@
-FROM registry.cn-hangzhou.aliyuncs.com/devops_hu/maven:3.5.2
-
-ARG USER_HOME_DIR="/root"
-
-WORKDIR ${USER_HOME_DIR}
-
-COPY . .
-
-RUN chmod 755 ${USER_HOME_DIR}/bin/*.sh \
-    && rm -rf /tmp/* /var/cache/apk/*
-
-EXPOSE 8080
-ENTRYPOINT ["/bin/sh", "docker-entrypoint.sh"]
+FROM registry.cn-hangzhou.aliyuncs.com/devops_hu/maven:3.5.2
+
+ARG USER_HOME_DIR="/root"
+
+WORKDIR ${USER_HOME_DIR}
+
+COPY . .
+
+RUN chmod 755 ${USER_HOME_DIR}/bin/*.sh \
+    && cd $USER_HOME_DIR && mvn install \
+    && rm -rf /tmp/* /var/cache/apk/*
+
+EXPOSE 8080
+ENTRYPOINT ["/bin/sh", "docker-entrypoint.sh"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 6eb1438..a321233 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,3 +1,2 @@
-#!/bin/sh
-cd /root && mvn install
+#!/bin/sh
 /bin/sh /root/bin/gateway.sh
\ No newline at end of file
-- 
Gitee