SQuiz/amocrm
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

add refresher docker compose service

Browse Source
This commit is contained in:
skeris 2024-12-03 16:40:23 +03:00
parent bd307dcddf
commit 7de5821692
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -7,9 +7,11 @@ ENV GOPRIVATE=penahub.gitlab.yandexcloud.net/backend/penahub_common
RUN git config --global url."https://buildToken:glpat-axA8ttckx3aPf_xd2Dym@penahub.gitlab.yandexcloud.net/".insteadOf "https://penahub.gitlab.yandexcloud.net/" RUN git config --global url."https://buildToken:glpat-axA8ttckx3aPf_xd2Dym@penahub.gitlab.yandexcloud.net/".insteadOf "https://penahub.gitlab.yandexcloud.net/"
RUN go mod download RUN go mod download
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o amocrm ./cmd/main.go RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o amocrm ./cmd/main.go
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o token_refresher ./cmd/tokens/main.go
FROM penahub.gitlab.yandexcloud.net:5050/devops/dockerhub-backup/alpine as prod FROM penahub.gitlab.yandexcloud.net:5050/devops/dockerhub-backup/alpine as prod
COPY --from=build /app/amocrm . COPY --from=build /app/amocrm .
COPY --from=build /app/token_refresher .
EXPOSE 1488 EXPOSE 1488
ENV IS_PROD_LOG=false ENV IS_PROD_LOG=false
ENV IS_PROD=false ENV IS_PROD=false

2
cmd/tokens/refresh_wc/tokens_updater.go
View File

@ -84,7 +84,7 @@ func (wc *WebHookUpdater) processTasks(ctx context.Context) {
}) })
if err != nil { if err != nil {
wc.logger.Error("error update token in db", zap.Error(err)) wc.logger.Error("error update token in db", zap.Error(err))
return continue
} }
} }
} }

26
deployments/main/docker-compose.yaml
View File

@ -26,3 +26,29 @@ services:
INTEGRATION_SECRET: "YRvT2CRFprN7r5N021YTSe1LKT0HJdhaE6GJbGYs08q9llyDrwE5FMuM3HXl7CZ0" INTEGRATION_SECRET: "YRvT2CRFprN7r5N021YTSe1LKT0HJdhaE6GJbGYs08q9llyDrwE5FMuM3HXl7CZ0"
ports: ports:
- 10.8.0.9:1492:1488 - 10.8.0.9:1492:1488
refresher:
hostname: amocrm-refresher
container_name: amocrm-refresher
image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID
tty: true
command: /token_refresher
environment:
HTTP_HOST: '0.0.0.0'
HTTP_PORT: 1488
REDIS_ADDR: '10.8.0.9:6379'
REDIS_PASS: 'Redalert2'
REDIS_DB: 4
PENA_SOCIAL_AUTH_URL: 'http://10.8.0.8:59344/amocrm/auth'
PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY
PG_CRED: 'host=10.8.0.9 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable'
PUBLIC_KEY: $PEM_PUB_USERID
PRIVATE_KEY: $PEM_PRIV_USERID
KAFKA_BROKERS: 10.8.0.8:9092
KAFKA_TOPIC: "squiz-amocrm"
GRPC_HOST: "0.0.0.0"
RETURN_URL: "https://quiz.pena.digital/squiz/amocrm/oauth"
REDIRECT_URL: "https://quiz.pena.digital/integrations"
INTEGRATION_ID: "48fc50c2-67a6-4619-bd54-23311619cc79"
INTEGRATION_SECRET: "YRvT2CRFprN7r5N021YTSe1LKT0HJdhaE6GJbGYs08q9llyDrwE5FMuM3HXl7CZ0"