From dd11eef4d69c2af78fb02b03e7e1e4467cd95c66 Mon Sep 17 00:00:00 2001
From: albrecht <flo@DESKTOP-ERC0T8S.localdomain>
Date: Tue, 13 Jun 2023 19:59:35 +0200
Subject: [PATCH] angepasst von schmolli
---
docker-compose.yml | 42 +++++++++++++++--------------
src/banktransfer/Dockerfile | 7 ++---
src/myaktion/Dockerfile | 10 +++++--
src/myaktion/client/banktransfer.go | 3 +--
4 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 8f1eb50..9df5077 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,20 +1,22 @@
-services:
- banktransfer:
- build:
- context: ./src
- dockerfile: banktransfer/Dockerfile
- myaktion:
- build:
- context: ./src
- dockerfile: myaktion/Dockerfile
- ports:
- - "8000:8000"
- environment:
- - DB_CONNECT=mariadb:3306
- - BANKTRANSFER_CONNECT=banktransfer:9111
- - LOG_LEVEL=info # change to trace for debugging
- mariadb:
- image: mariadb:10.5
- environment:
- - MYSQL_ROOT_PASSWORD=root
- - MYSQL_DATABASE=myaktion
\ No newline at end of file
+services:
+ banktransfer:
+ build:
+ context: ./src
+ dockerfile: banktransfer/Dockerfile
+ ports:
+ - "9111:9111"
+ myaktion:
+ build:
+ context: ./src
+ dockerfile: myaktion/Dockerfile
+ ports:
+ - "8000:8000"
+ environment:
+ - DB_CONNECT=mariadb:3306
+ - BANKTRANSFER_CONNECT=banktransfer:9111
+ - LOG_LEVEL=info # change to trace for debugging
+ mariadb:
+ image: mariadb:10.5
+ environment:
+ - MYSQL_ROOT_PASSWORD=root
+ - MYSQL_DATABASE=myaktion
diff --git a/src/banktransfer/Dockerfile b/src/banktransfer/Dockerfile
index a40980b..808cebe 100644
--- a/src/banktransfer/Dockerfile
+++ b/src/banktransfer/Dockerfile
@@ -1,12 +1,13 @@
-FROM golang:1.16-buster
+FROM golang:1.20-buster
WORKDIR /go/src/app
COPY ./banktransfer .
RUN apt update
RUN apt install -y protobuf-compiler
+
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
-RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@1.2
+RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
RUN go mod download
RUN go generate ./...
@@ -14,4 +15,4 @@ RUN go install
CMD ["banktransfer"]
-EXPOSE 9111
\ No newline at end of file
+EXPOSE 9111
diff --git a/src/myaktion/Dockerfile b/src/myaktion/Dockerfile
index 77cd25e..e18fcf7 100644
--- a/src/myaktion/Dockerfile
+++ b/src/myaktion/Dockerfile
@@ -1,18 +1,24 @@
-FROM golang:1.16-buster
+FROM golang:1.20-buster
# non-go modules dependencies
RUN apt update
RUN apt install -y protobuf-compiler
+
RUN go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
-RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@1.2
+RUN go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
+
# copy code and protobuf
WORKDIR /go/src/app
COPY ./myaktion .
COPY ./banktransfer/grpc/banktransfer/banktransfer.proto ./client/banktransfer/
+
RUN go mod download
RUN go generate ./...
RUN go install
+
RUN wget https://raw.githubusercontent.com/vishnubob/wait-for-it/81b1373f17855a4dc21156cfe1694c31d7d1792e/wait-for-it.sh
RUN chmod +x ./wait-for-it.sh ./docker-entrypoint.sh
+
ENTRYPOINT ["./docker-entrypoint.sh"]
CMD ["myaktion"]
+
EXPOSE 8000
\ No newline at end of file
diff --git a/src/myaktion/client/banktransfer.go b/src/myaktion/client/banktransfer.go
index 0b684be..b6f66b5 100644
--- a/src/myaktion/client/banktransfer.go
+++ b/src/myaktion/client/banktransfer.go
@@ -14,13 +14,12 @@ var (
bankTransferTarget = os.Getenv("BANKTRANSFER_CONNECT")
)
-func GetBankTransferConnection() (*grpc.ClientConn, error) {
+func GetBankTransferConnection(ctx context.Context) (*grpc.ClientConn, error) {
var err error
log.WithFields(log.Fields{
"target": bankTransferTarget,
}).Infoln("Connecting to banktransfer service")
var conn *grpc.ClientConn
- ctx, _ := context.WithTimeout(context.Background(), TimeoutLimitation)
conn, err = grpc.DialContext(ctx, bankTransferTarget, grpc.WithInsecure(), grpc.WithBlock())
if err != nil {
return nil, err
--
GitLab