From b9a94a93bd75f3133a198a55f7b61d5a15226a58 Mon Sep 17 00:00:00 2001 From: slaventius Date: Wed, 15 Feb 2023 08:46:21 +0300 Subject: [PATCH] * --- .vscode/tasks.json | 2 ++ build/Makefile | 6 +++--- scripts/start.sh | 13 +++++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 445a7be..17de12a 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -16,6 +16,8 @@ "cwd": "${workspaceRoot}", "env": { "APP": "authPostmanService", + // "GOOS": "${env:GOOS}", + // "GOARCH": "${env:GOARCH}", "GOOS": "linux", "GOARCH": "amd64", "GOBIN": "${env:GOPATH}/bin" diff --git a/build/Makefile b/build/Makefile index 0a336c8..e2c8dd4 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,7 +1,7 @@ .DEFAULT_GOAL := build -GOOS=linux -GOARCH=amd64 +GOOS=$(shell go env GOOS) +GOARCH=$(shell go env GOARCH) GOBIN=$(shell go env GOPATH)/bin APP=authPostmanService APP_BINARY=${GOBIN}/${APP}-${GOOS}-${GOARCH} @@ -10,7 +10,7 @@ APP_TAG=slaventius/test3k_auth_postman:latest clean: @echo "cleaning ${APP_BINARY}" @go clean - @rm ${APP_BINARY} + @rm -f ${APP_BINARY} build: clean @echo "building ${APP_BINARY}" diff --git a/scripts/start.sh b/scripts/start.sh index 8c049a4..b9708ca 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -4,8 +4,13 @@ export SMTP_HOST=smtp.mail.ru export SMTP_PORT=587 export SMTP_SENDER=test3kbotan@mail.ru export SMTP_PASSWORD=vSJYfUbpamiUFkKx1DJA -export KAFKA_PORT=19092 -export KAFKA_HOST=127.0.0.1 -# export KAFKA_HOST=37.143.12.169 +export KAFKA_PORT=9092 +export KAFKA_HOST=37.143.12.169 +export SENTRY_DSN="https://3f4b31dbbd9a4a6b8a71f9881d962f25@o4504654569799680.ingest.sentry.io/4504654572683264" -./authPostmanService +export APP=authPostmanService +export GOOS=$(eval go env GOOS) +export GOARCH=$(eval go env GOARCH) +export GOBIN=$(eval go env GOPATH)/bin + +${GOBIN}/${APP}-${GOOS}-${GOARCH}