PenaSide/heruvym
3
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

--
All checks were successful
Deploy / CreateImage (push) Successful in 2m15s
Details
Deploy / DeployService (push) Successful in 1m4s
Details

Browse Source
This commit is contained in:
skeris 2024-12-02 01:10:20 +03:00
parent 76b0ddb1e1
commit b01a122ed4
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/deploy.yml
View File

@ -10,7 +10,7 @@ on:
jobs: jobs:
CreateImage: CreateImage:
runs-on: [hubstaging] runs-on: [hubstaging]
uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.4 uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.4-p7
with: with:
runner: hubstaging runner: hubstaging
secrets: secrets:

6
Dockerfile
View File

@ -1,12 +1,10 @@
FROM gitea.pena/penadevops/container-images/golang:main as builder FROM gitea.pena/penadevops/container-images/golang:main as builder
WORKDIR /app WORKDIR /app
RUN apk add git
COPY . . COPY . .
ENV GOPRIVATE=gitea.pena/PenaSide/linters-golang ENV GOPRIVATE=gitea.pena/PenaSide/linters-golang
ENV GOINSECURE=gitea.pena/PenaSide/linters-golang ENV GOINSECURE=gitea.pena/PenaSide/linters-golang
RUN go env RUN go mod download
RUN go mod download -x RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o heruvym cmd/main.go
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o heruvym
FROM gitea.pena/penadevops/container-images/alpine:main FROM gitea.pena/penadevops/container-images/alpine:main
COPY --from=builder /app/heruvym . COPY --from=builder /app/heruvym .

17
deployments/staging/docker-compose.yaml
View File

@ -3,22 +3,29 @@ services:
restart: unless-stopped restart: unless-stopped
image: gitea.pena:3000/penaside/heruvym/staging:$GITHUB_RUN_NUMBER image: gitea.pena:3000/penaside/heruvym/staging:$GITHUB_RUN_NUMBER
ports: ports:
- 10.7.0.6:1487:1488 - 10.7.0.6:1487:3000
labels: labels:
com.pena.upload: true com.pena.upload: true
com.pena.allowed_headers: content-type,authorization,response-type com.pena.allowed_headers: content-type,authorization,response-type
tty: true tty: true
environment: environment:
- BB_PORT=1488 - HTTP_PORT=3000
- HTTP_HOST=0.0.0.0
- BB_IS_PROD=true - BB_IS_PROD=true
- BB_MINIO_AK=5CV77KVDUU9H0II9R24M - BB_MINIO_AK=5CV77KVDUU9H0II9R24M
- BB_MINIO_EP=s3.timeweb.cloud - BB_MINIO_EP=s3.timeweb.cloud
- BB_MINIO_SK=0W0m8DyvdAKRJnsAy6mB5zndQ7RouJBLhqhtThcu - BB_MINIO_SK=0W0m8DyvdAKRJnsAy6mB5zndQ7RouJBLhqhtThcu
- BB_MONGO_URI=$BB_MONGO_URI - MONGO_HOST=mongodb.pena
- MONGO_PORT=27017
- MONGO_USER=support
- MONGO_PASSWORD=54143ffdd9304865586e5cf2
- MONGO_DB=support
- MONGO_AUTH=support
- BB_MONGO_URI=mongodb://support:54143ffdd9304865586e5cf2@mongodb.pena/?authSource=support
- S3_REGION=ru-1 - S3_REGION=ru-1
- JWT_SECRET=$JWT_SECRET - JWT_SECRET="-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----"
- TELEGRAM_TOKEN=6414077478:AAFk03HezovLT2kO_i9OYswH8Weirsgp9GU - TELEGRAM_TOKEN=6414077478:AAFk03HezovLT2kO_i9OYswH8Weirsgp9GU
- TELEGRAM_CHAT_ID=1002089014760 - TELEGRAM_CHAT_ID=1002089014760
- REDIS_HOST=10.8.0.5:6379 - REDIS_HOST=10.7.0.6:6379
- REDIS_PASSWORD=Redalert2 - REDIS_PASSWORD=Redalert2
- REDIS_DB=4 - REDIS_DB=4

3
internal/utils/jwt_adapter/jwt_adapter.go
View File

@ -27,6 +27,8 @@ type JwtAdapter struct {
func init() { func init() {
aS := os.Getenv("JWT_SECRET") aS := os.Getenv("JWT_SECRET")
fmt.Println("JWT_SECRET", aS)
if len(aS) != 0 { if len(aS) != 0 {
accessSecret = aS accessSecret = aS
} }
@ -65,6 +67,7 @@ func (receiver *JwtAdapter) Validate() error {
} }
func Decode(tokenString string) (*JwtAdapter, error) { func Decode(tokenString string) (*JwtAdapter, error) {
fmt.Println("JWT_SECRET2", tokenString, accessSecret)
token, err := jwt.ParseWithClaims(tokenString, &JwtAdapter{}, func(token *jwt.Token) (interface{}, error) { token, err := jwt.ParseWithClaims(tokenString, &JwtAdapter{}, func(token *jwt.Token) (interface{}, error) {
if _, ok := token.Method.(*jwt.SigningMethodRSA); !ok { if _, ok := token.Method.(*jwt.SigningMethodRSA); !ok {
return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"]) return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])