add docker config

4 years ago · b4364a645b
parent 29bc1a4e6c
commit b4364a645b
21 changed files with 252 additions and 21 deletions
--- a/.gitignore
+++ b/.gitignore
@ -43,4 +43,6 @@
 /dsSupport/WinBuild/
 /dsSupport/Logs/

-/dsSdsf/.idea/
+/dsSdsf/.idea/
+
+*.log
--- a/.idea/runConfigurations/2345.xml
+++ b/.idea/runConfigurations/2345.xml
@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="2345" type="GoRemoteDebugConfigurationType" factoryName="Go Remote">
+    <option name="disconnectOption" value="STOP" />
+    <disconnect value="STOP" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/2346.xml
+++ b/.idea/runConfigurations/2346.xml
@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="2346" type="GoRemoteDebugConfigurationType" factoryName="Go Remote" port="2346">
+    <option name="disconnectOption" value="ASK" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/2347.xml
+++ b/.idea/runConfigurations/2347.xml
@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="2347" type="GoRemoteDebugConfigurationType" factoryName="Go Remote" port="2347">
+    <option name="disconnectOption" value="ASK" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/2348.xml
+++ b/.idea/runConfigurations/2348.xml
@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="2348" type="GoRemoteDebugConfigurationType" factoryName="Go Remote" port="2348">
+    <option name="disconnectOption" value="ASK" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/2349.xml
+++ b/.idea/runConfigurations/2349.xml
@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="2349" type="GoRemoteDebugConfigurationType" factoryName="Go Remote" port="2349">
+    <option name="disconnectOption" value="ASK" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/docker__Compose_dev.xml
+++ b/.idea/runConfigurations/docker__Compose_dev.xml
@ -0,0 +1,19 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="docker: Compose dev" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="envFilePath" value="" />
+        <option name="commandLineOptions" value="--build" />
+        <option name="secondarySourceFiles">
+          <list>
+            <option value="docker/docker-compose.dev.yml" />
+          </list>
+        </option>
+        <option name="sourceFilePath" value="docker/docker-compose.yml" />
+        <option name="upExitCodeFromService" value="" />
+        <option name="upTimeout" value="" />
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>
--- a/docker/conf/kafka/server.properties
+++ b/docker/conf/kafka/server.properties
@ -3,7 +3,7 @@ node.id=1
 controller.quorum.voters=1@localhost:9093
 listeners=PLAINTEXT://:9092,CONTROLLER://:9093
 inter.broker.listener.name=PLAINTEXT
-advertised.listeners=PLAINTEXT://localhost:9092
+advertised.listeners=PLAINTEXT://kafka:9092
 controller.listener.names=CONTROLLER
 listener.security.protocol.map=CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,SSL:SSL,SASL_PLAINTEXT:SASL_PLAINTEXT,SASL_SSL:SASL_SSL
 num.network.threads=3
--- a/docker/docker-compose.build.yml
+++ b/docker/docker-compose.build.yml
@ -1,7 +1,7 @@
 version: "3.8"
 services:
    build:
-        image: golang:1.16.4-buster
+        image: golang:1.16.5-buster
        volumes: 
            - ../:/go/src
        environment: 
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@ -1,19 +1,87 @@
 version: "3.8"
 services:
    dsbaserpc:
+        security_opt:
+            - seccomp:unconfined
+        cap_add:
+            - SYS_PTRACE
+        build:
+            context: ../dsBaseRpc
+            dockerfile: Dockerfile.dev
+            args:
+                - MODULE=dsBaseRpc
+        ports:
+            - 8001:8001
+            - 2345:2345
+        volumes:
+            - ../dsBaseRpc/Config/Config.docker.ini:/app/Config/Config.ini
+    dsbaseweb:
        cap_add:
            - SYS_PTRACE
        security_opt:
-            - "seccomp:unconfined"
+            - seccomp:unconfined
        tty: true
        stdin_open: true
-        build: 
-            context: ../dsBaseRpc
+        build:
+            context: ../dsBaseWeb
+            dockerfile: Dockerfile.dev
+            args:
+                - MODULE=dsBaseWeb
+        ports:
+            - 8002:8002
+            - 2346:2345
+        volumes:
+            - ../dsBaseWeb/Config/Config.docker.ini:/app/Config/Config.ini
+    dsbigdata:
+        cap_add:
+            - SYS_PTRACE
+        security_opt:
+            - seccomp:unconfined
+        tty: true
+        stdin_open: true
+        build:
+            context: ../dsBigData
+            dockerfile: Dockerfile.dev
+            args:
+                - MODULE=dsBigData
+        ports:
+            - 8004:8004
+            - 2347:2345
+        volumes:
+            - ../dsBigData/Config/Config.docker.ini:/app/Config/Config.ini
+    dssso:
+        cap_add:
+            - SYS_PTRACE
+        security_opt:
+            - seccomp:unconfined
+        tty: true
+        stdin_open: true
+        build:
+            context: ../dsSso
+            dockerfile: Dockerfile.dev
+            args:
+                - MODULE=dsSso
+        ports:
+            - 8004:8004
+            - 2348:2345
+        volumes:
+            - ../dsSso/Config/Config.docker.ini:/app/Config/Config.ini
+    dssupport:
+        cap_add:
+            - SYS_PTRACE
+        security_opt:
+            - seccomp:unconfined
+        tty: true
+        stdin_open: true
+        build:
+            context: ../dsSupport
            dockerfile: Dockerfile.dev
+            args:
+                - MODULE=dsSupport
        ports:
-            - 8001:8001    
-            - 2345:2345     
-        volumes: 
-            - ../dsBaseRpc:/go/src
-            - ../dsBaseRpc/Config/Config.ini.docker:/go/src/Config/Config.ini
-        command: bash -c "cd /go/src && dlv debug --headless --listen=:2345 --api-version=2 --log main.go"
+            - 8005:8005
+            - 2349:2345
+        volumes:
+            - ../dsSupport/Config/Config.docker.ini:/app/Config/Config.ini
+        depends_on:
+            - elasticsearch
--- a/docker/docker-compose.pro.yml
+++ b/docker/docker-compose.pro.yml
@ -7,30 +7,29 @@ services:
            - 8001:8001
        volumes:
            - ./app/dsBaseRpc:/app
-            - ./conf/dsBaseRpc/Config/Config.docker.ini:/app/Config/Config.ini
+            - ./app/dsBaseRpc/Config/Config.docker.ini:/app/Config/Config.ini
        working_dir: /app
        command: bash -c "./dsBaseRpc"
    dsbaseweb:
        image: debian:buster-20210511
-        #restart: always
+        restart: always
        ports:
            - 8002:8002
        volumes:
            - ./app/dsBaseWeb:/app
-            - ./conf/dsBaseWeb/Config/Config.docker.ini:/app/Config/Config.ini
+            - ./app/dsBaseWeb/Config/Config.docker.ini:/app/Config/Config.ini
        working_dir: /app
        command: bash -c "./dsBaseWeb"
-        #command: tail -f /dev/null
        depends_on: 
            - kafka
    dsbigdata:
        image: debian:buster-20210511
-        #restart: always
+        restart: always
        ports:
            - 8004:8004
        volumes:
            - ./app/dsBigData:/app
-            - ./conf/dsBigData/Config/Config.docker.ini:/app/Config/Config.ini
+            - ./app/dsBigData/Config/Config.docker.ini:/app/Config/Config.ini
        working_dir: /app
        command: bash -c "./dsBigData"
        depends_on: 
@ -42,7 +41,7 @@ services:
            - 8000:8000
        volumes:
            - ./app/dsSso:/app
-            - ./conf/dsSso/Config/Config.docker.ini:/app/Config/Config.ini
+            - ./app/dsSso/Config/Config.docker.ini:/app/Config/Config.ini
        working_dir: /app
        command: bash -c "./dsSso"
        depends_on: 
@ -54,7 +53,7 @@ services:
            - 8005:8005
        volumes:
            - ./app/dsSupport:/app
-            - ./conf/dsSupport/Config/Config.docker.ini:/app/Config/Config.ini
+            - ./app/dsSupport/Config/Config.docker.ini:/app/Config/Config.ini
        working_dir: /app
        command: bash -c "./dsSupport"
        depends_on: 
--- a/docker/conf/dsBaseRpc/Config/Config.docker.ini
+++ b/docker/conf/dsBaseRpc/Config/Config.docker.ini
--- a/dsBaseRpc/Dockerfile.dev
+++ b/dsBaseRpc/Dockerfile.dev
@ -0,0 +1,22 @@
+FROM golang:1.16.5-buster as build
+
+RUN go env -w GOPROXY=https://goproxy.cn
+RUN go get github.com/go-delve/delve/cmd/dlv
+
+ARG MODULE
+ADD . /go/src/$MODULE
+WORKDIR /go/src/$MODULE
+
+RUN go build -gcflags "all=-N -l" -o /example main.go
+
+FROM debian:buster-20210511 as Final
+
+WORKDIR /app
+COPY --from=build /go/bin/dlv /
+COPY --from=build /example .
+COPY Shell .
+COPY Config ./Config
+#COPY Xml ./Xml
+COPY Sql ./Sql
+
+CMD /dlv --headless --listen=:2345 --api-version=2 --accept-multiclient exec /app/example
--- a/docker/conf/dsBaseWeb/Config/Config.docker.ini
+++ b/docker/conf/dsBaseWeb/Config/Config.docker.ini
@ -32,7 +32,7 @@ port = 8002
 project_name = dsBaseWeb

 [kafka]
-brokers = kafka:9092,
+brokers = kafka:9092
 partition = 20
 replication = 1
 KafkaAccessLogTopic = log_baseweb
--- a/dsBaseWeb/Dockerfile.dev
+++ b/dsBaseWeb/Dockerfile.dev
@ -0,0 +1,22 @@
+FROM golang:1.16.5-buster as build
+
+RUN go env -w GOPROXY=https://goproxy.cn
+RUN go get github.com/go-delve/delve/cmd/dlv
+
+ARG MODULE
+ADD . /go/src/$MODULE
+WORKDIR /go/src/$MODULE
+
+RUN go build -gcflags "all=-N -l" -o /example main.go
+
+FROM debian:buster-20210511 as Final
+
+WORKDIR /app
+COPY --from=build /go/bin/dlv /
+COPY --from=build /example .
+COPY Shell .
+COPY Config ./Config
+COPY docs ./docs
+#COPY Xml ./Xml
+
+CMD /dlv --headless --listen=:2345 --api-version=2 --accept-multiclient exec /app/example
--- a/docker/conf/dsBigData/Config/Config.docker.ini
+++ b/docker/conf/dsBigData/Config/Config.docker.ini
--- a/dsBigData/Dockerfile.dev
+++ b/dsBigData/Dockerfile.dev
@ -0,0 +1,22 @@
+FROM golang:1.16.5-buster as build
+
+RUN go env -w GOPROXY=https://goproxy.cn
+RUN go get github.com/go-delve/delve/cmd/dlv
+
+ARG MODULE
+ADD . /go/src/$MODULE
+WORKDIR /go/src/$MODULE
+
+RUN go build -gcflags "all=-N -l" -o /example main.go
+
+FROM debian:buster-20210511 as Final
+
+WORKDIR /app
+COPY --from=build /go/bin/dlv /
+COPY --from=build /example .
+COPY Shell .
+COPY Config ./Config
+#COPY Xml ./Xml
+#COPY Sql ./Sql
+
+CMD /dlv --headless --listen=:2345 --api-version=2 --accept-multiclient exec /app/example
--- a/docker/conf/dsSso/Config/Config.docker.ini
+++ b/docker/conf/dsSso/Config/Config.docker.ini
--- a/dsSso/Dockerfile.dev
+++ b/dsSso/Dockerfile.dev
@ -0,0 +1,23 @@
+FROM golang:1.16.5-buster as build
+
+RUN go env -w GOPROXY=https://goproxy.cn
+RUN go get github.com/go-delve/delve/cmd/dlv
+
+ARG MODULE
+ADD . /go/src/$MODULE
+WORKDIR /go/src/$MODULE
+
+RUN go build -gcflags "all=-N -l" -o /example main.go
+
+FROM debian:buster-20210511 as Final
+
+WORKDIR /app
+COPY --from=build /go/bin/dlv /
+COPY --from=build /example .
+COPY Shell .
+COPY Config ./Config
+COPY docs ./docs
+#COPY Xml ./Xml
+#COPY Sql ./Sql
+
+CMD /dlv --headless --listen=:2345 --api-version=2 --accept-multiclient exec /app/example
--- a/docker/conf/dsSupport/Config/Config.docker.ini
+++ b/docker/conf/dsSupport/Config/Config.docker.ini
--- a/dsSupport/Dockerfile.dev
+++ b/dsSupport/Dockerfile.dev
@ -0,0 +1,23 @@
+FROM golang:1.16.5-buster as build
+
+RUN go env -w GOPROXY=https://goproxy.cn
+RUN go get github.com/go-delve/delve/cmd/dlv
+
+ARG MODULE
+ADD . /go/src/$MODULE
+WORKDIR /go/src/$MODULE
+
+RUN go build -gcflags "all=-N -l" -o /example main.go
+
+FROM debian:buster-20210511 as Final
+
+WORKDIR /app
+COPY --from=build /go/bin/dlv /
+COPY --from=build /example .
+COPY Shell .
+COPY Config ./Config
+COPY docs ./docs
+#COPY Xml ./Xml
+#COPY Sql ./Sql
+
+CMD /dlv --headless --listen=:2345 --api-version=2 --accept-multiclient exec /app/example