Skip to content
Snippets Groups Projects
Commit dd11eef4 authored by albrecht's avatar albrecht
Browse files

angepasst von schmolli

parent ae467877
No related branches found
No related tags found
1 merge request!3Master
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
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
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
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment