From b9f23abf962dd5243e68a0a4508a75f6762aefbb Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 21 Jun 2021 09:15:17 +0800 Subject: [PATCH] remove go modules Dockerfile.dev,add Dockerfile.dev to docker folder --- {dsBaseRpc => docker}/Dockerfile.dev | 9 +- docker/docker-compose.dev.yml | 124 +++++++++++++-------------- dsBaseWeb/Dockerfile.dev | 22 ----- dsBigData/Dockerfile.dev | 22 ----- dsSso/Dockerfile.dev | 23 ----- dsSupport/Dockerfile.dev | 23 ----- 6 files changed, 67 insertions(+), 156 deletions(-) rename {dsBaseRpc => docker}/Dockerfile.dev (78%) delete mode 100644 dsBaseWeb/Dockerfile.dev delete mode 100644 dsBigData/Dockerfile.dev delete mode 100644 dsSso/Dockerfile.dev delete mode 100644 dsSupport/Dockerfile.dev diff --git a/dsBaseRpc/Dockerfile.dev b/docker/Dockerfile.dev similarity index 78% rename from dsBaseRpc/Dockerfile.dev rename to docker/Dockerfile.dev index dc4e7b14..c096cb67 100644 --- a/dsBaseRpc/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -14,9 +14,10 @@ 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 +COPY *Config ./Config +COPY *Xml ./Xml +COPY *Sql ./Sql +COPY *docs ./docs +COPY *Shell ./ CMD /dlv --headless --listen=:2345 --api-version=2 --accept-multiclient exec /app/example \ No newline at end of file diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 79696c4f..92036da4 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -1,65 +1,65 @@ 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 - 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 - 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 - build: - context: ../dsSso - dockerfile: Dockerfile.dev - args: - - MODULE=dsSso - ports: - - 8000:8000 - - 2348:2345 - volumes: - - ../dsSso/Config/Config.docker.ini:/app/Config/Config.ini + dsbaserpc: + security_opt: + - seccomp:unconfined + cap_add: + - SYS_PTRACE + build: + context: ../dsBaseRpc + dockerfile: ../docker/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 + build: + context: ../dsBaseWeb + dockerfile: ../docker/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 + build: + context: ../dsBigData + dockerfile: ../docker/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 + build: + context: ../dsSso + dockerfile: ../docker/Dockerfile.dev + args: + - MODULE=dsSso + ports: + - 8000:8000 + - 2348:2345 + volumes: + - ../dsSso/Config/Config.docker.ini:/app/Config/Config.ini # dssupport: # cap_add: # - SYS_PTRACE @@ -67,7 +67,7 @@ services: # - seccomp:unconfined # build: # context: ../dsSupport -# dockerfile: Dockerfile.dev +# dockerfile: ../docker/Dockerfile.dev # args: # - MODULE=dsSupport # ports: @@ -76,4 +76,4 @@ services: # volumes: # - ../dsSupport/Config/Config.docker.ini:/app/Config/Config.ini # depends_on: -# - elasticsearch \ No newline at end of file +# - elasticsearch diff --git a/dsBaseWeb/Dockerfile.dev b/dsBaseWeb/Dockerfile.dev deleted file mode 100644 index 59ab89dd..00000000 --- a/dsBaseWeb/Dockerfile.dev +++ /dev/null @@ -1,22 +0,0 @@ -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 \ No newline at end of file diff --git a/dsBigData/Dockerfile.dev b/dsBigData/Dockerfile.dev deleted file mode 100644 index ebca6d4d..00000000 --- a/dsBigData/Dockerfile.dev +++ /dev/null @@ -1,22 +0,0 @@ -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 \ No newline at end of file diff --git a/dsSso/Dockerfile.dev b/dsSso/Dockerfile.dev deleted file mode 100644 index 97c33dec..00000000 --- a/dsSso/Dockerfile.dev +++ /dev/null @@ -1,23 +0,0 @@ -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 \ No newline at end of file diff --git a/dsSupport/Dockerfile.dev b/dsSupport/Dockerfile.dev deleted file mode 100644 index 97c33dec..00000000 --- a/dsSupport/Dockerfile.dev +++ /dev/null @@ -1,23 +0,0 @@ -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 \ No newline at end of file