From 582a3cea75c6abffa068bbff9f19bd95d97ab0a9 Mon Sep 17 00:00:00 2001 From: Pasha Date: Mon, 9 Dec 2024 15:35:37 +0300 Subject: [PATCH] - --- .gitea/workflows/deploy.yml | 4 ++-- Dockerfile | 14 ++------------ cmd/validator/main.go | 2 +- deployments/staging/docker-compose.yaml | 23 ++++++++++------------- 4 files changed, 15 insertions(+), 28 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index c8decfa..da3ce89 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -10,7 +10,7 @@ on: jobs: CreateImage: runs-on: [hubstaging] - uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.0.1 + uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p with: runner: hubstaging secrets: @@ -19,7 +19,7 @@ jobs: DeployService: runs-on: [hubstaging] needs: CreateImage - uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.0.3 + uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 with: runner: hubstaging actionid: ${{ gitea.run_id }} diff --git a/Dockerfile b/Dockerfile index a995215..d58e3f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,19 @@ # BUILD -FROM penahub.gitlab.yandexcloud.net:5050/devops/dockerhub-backup/golang:main.3862 AS build +FROM gitea.pena/penadevops/container-images/golang:main as build # Update packages and clear cache -RUN apk add --no-cache curl # Set work directory WORKDIR /app -RUN apk add git # Create binary directory RUN mkdir /app/bin -p -# Create golang migrate util directory -RUN mkdir /bin/golang-migrate -p -# Add migrate tool -ADD ./tools/migrate /bin/golang-migrate/ -# Add main files to app ADD . . -RUN git config --global url."https://buildToken:glpat-axA8ttckx3aPf_xd2Dym@penahub.gitlab.yandexcloud.net/".insteadOf "https://penahub.gitlab.yandexcloud.net/" # Download go depences RUN go mod download # Build app RUN GOOS=linux go build -o bin ./... # PRODUCTION -FROM penahub.gitlab.yandexcloud.net:5050/devops/dockerhub-backup/alpine:main.3862 AS production +FROM gitea.pena/penadevops/container-images/alpine:main # Install packages RUN apk --no-cache add ca-certificates @@ -30,7 +22,5 @@ WORKDIR /app # Copy build file COPY --from=build /app/bin/app ./app COPY ./report.docx ./report.docx -# Install migrate tool -COPY --from=build /bin/golang-migrate /usr/local/bin # CMD CMD ["./app"] diff --git a/cmd/validator/main.go b/cmd/validator/main.go index 0f57966..82e70d6 100644 --- a/cmd/validator/main.go +++ b/cmd/validator/main.go @@ -68,7 +68,7 @@ func loadConfig() (*models.Config, error) { var config models.Config if err := env.Parse(&config); err != nil { - log.Fatalf("failed to parse environment variables: %v", err) + return nil, err } return &config, nil diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index 34bdc1a..0f2bd6c 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -1,10 +1,8 @@ version: "3.3" services: - customer-app-stagingv1.0.1: - hostname: customerv1.0.1 - container_name: customerv1.0.1 - image: $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID + customerv1.0.1: + image: gitea.pena:3000/penaside/customer/staging:$GITHUB_RUN_NUMBER tty: true labels: com.pena.allowed_headers: content-type,authorization,response-type @@ -19,12 +17,13 @@ services: # - MONGO_PORT=27017 # - MONGO_USER=$MONGO_USER # - MONGO_PASSWORD=$MONGO_PASSWORD - - MONGO_URL = TODO + - MONGO_URL=mongodb://customer:WAR2Fr6SuPKhtvEp@10.7.0.6:27017/?authSource=customer - MONGO_DB_NAME=customer # - MONGO_AUTH=customer - TELEGRAM_RS_PAY_CHANNEL_ID=-1002338593104 + - TELEGRAM_NOTIFICATION_CHANNEL_ID=-1002338593104 - - KAFKA_BROKERS=10.8.0.6:9092 + - KAFKA_BROKERS=10.7.0.6:9092 - KAFKA_TOPIC_TARIFF=tariffs - AUTH_MICROSERVICE_URL=http://10.8.0.6:59300 @@ -39,18 +38,16 @@ services: - MAIL_SENDER=noreply@mailing.pena.digital - MAIL_API_KEY=P0YsjUB137upXrr1NiJefHmXVKW1hmBWlpev - MAIL_ADDRESS=sells@pena.digital + - JWT_SECRET="-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\nr7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\nZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\nKKFD0I2Dr59BFVSGJwIDAQAB\n-----END PUBLIC KEY-----" - - JWT_PUBLIC_KEY=$JWT_PUBLIC_KEY - - JWT_ISSUER=pena-auth-service - - JWT_AUDIENCE=pena - ENCRYPT_PUBLIC_KEY=$USER_PKEY - ENCRYPT_PRIVATE_KEY=$USER_PRIVATEKEY - ADMIN_FRONT_URL=https://sadmin.pena - - TRASH_LOG_HOST=10.8.0.15:7113 + - TRASH_LOG_HOST=10.7.0.5:7113 - TELEGRAM_TOKEN=6112841016:AAH2nO1c6mqfMewBvHwdXCDp5PCclOuc99s ports: - - 10.8.0.6:8067:8065 - - 10.8.0.6:8070:8066 - - 10.8.0.6:9060:9065 + - 10.7.0.6:8067:8065 + - 10.7.0.6:8070:8066 + - 10.7.0.6:9060:9065 networks: - default