diff --git a/Dockerfile b/Dockerfile index 9ce2af3..a1bbf6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,6 @@ FROM gitea.pena/penadevops/container-images/golang:main as build WORKDIR /app ENV GOPRIVATE=gitea.pena/PenaSide/common,gitea.pena/PenaSide/linters-golang,gitea.pena/PenaSide/customer,gitea.pena/PenaSide/trashlog,gitea.pena/PenaSide/hlog ENV GOINSECURE=gitea.pena/PenaSide/common,gitea.pena/PenaSide/linters-golang,gitea.pena/PenaSide/customer,gitea.pena/PenaSide/trashlog,gitea.pena/PenaSide/hlog -ENV GOPROXY=https://proxy.golang.org,direct -ENV GOPATH=go-cache COPY . . RUN go mod download RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o app diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index 060b36d..386804f 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -1,24 +1,35 @@ version: "3.3" services: - admin: - container_name: hub-admin-backend-service + tariffs: restart: unless-stopped tty: true - image: $CI_REGISTRY_IMAGE/staging:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID + image: gitea.pena:3000/penaside/tariffs/staging:$GITHUB_RUN_NUMBER ports: - - 10.8.0.6:59303:8005 - networks: - - default + - 10.7.0.6:59303:8005 + - 10.7.0.6:59304:8006 environment: - - DB_HOST=10.8.0.6 - - DB_PORT=27017 - - ENVIRONMENT=staging - - HTTP_HOST=0.0.0.0 - - HTTP_PORT=8005 - - AUTH_SERVICE_HOST=http://10.8.0.6 - - AUTH_SERVICE_PORT=59300 - - DB_USERNAME=$DB_USERNAME - - DB_PASSWORD=$DB_PASSWORD - - DB_NAME=administrator - - PUBLIC_ACCESS_SECRET_KEY=$PUBLIC_ACCESS_SECRET_KEY + MONGO_URL: mongodb://administrator:64143ffdd9304865586e5cf1@10.7.0.6:27017/?authSource=administrator + DB_HOST: 10.7.0.6 + DB_PORT: 27017 + ENVIRONMENT: staging + INTERNAL_HTTP_ADDRESS: 0.0.0.0:8005 + INTERNAL_HTTP_ADDRESS: 0.0.0.0:8006 + AUTH_SERVICE_HOST: http://10.7.0.6 + AUTH_SERVICE_PORT: 59300 + DB_USERNAME: $DB_USERNAME + DB_PASSWORD: $DB_PASSWORD + JWT_PUBLIC_KEY: | +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE +r7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM +ZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w +KKFD0I2Dr59BFVSGJwIDAQAB +-----END PUBLIC KEY----- + PUBLIC_ACCESS_SECRET_KEY: | +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE +r7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM +ZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w +KKFD0I2Dr59BFVSGJwIDAQAB +-----END PUBLIC KEY-----