diff --git a/.drone.yml b/.drone.yml index 604a710..0b47f58 100644 --- a/.drone.yml +++ b/.drone.yml @@ -67,6 +67,30 @@ steps: - dotnet pack ./local-env/text-matcher/Nocr.TextMatcher.sln -o ./local-env/text-matcher/bin - dotnet nuget push ./local-env/text-matcher/bin/*Contract*.nupkg --api-key $NUGETAPIKEY --source musk --skip-duplicate +- name: nocr users build & push + image: plugins/docker + privileged: true + settings: + repo: hub.musk.fun/k8s/nocr/users + registry: hub.musk.fun + context: ./local-env/users + dockerfile: ./local-env/users/src/Nocr.Users.Host/Dockerfile + tags: ["${DRONE_COMMIT_SHA:0:7}", "latest"] + username: + from_secret: hub_username + password: + from_secret: hub_password + +- name: nocr users nuget package make & push + image: mcr.microsoft.com/dotnet/sdk:8.0 + environment: + VERSION: ${DRONE_TAG} + NUGETAPIKEY: + from_secret: nuget_musk_api_key + commands: + - dotnet nuget add source --name musk https://gitea.musk.fun/api/packages/users/nuget/index.json + - dotnet pack ./local-env/users/Nocr.Users.sln -o ./local-env/users/bin + - dotnet nuget push ./local-env/users/bin/*Contract*.nupkg --api-key $NUGETAPIKEY --source musk --skip-duplicate trigger: event: diff --git a/docker-compose.yml b/docker-compose.yml index f31f155..9d2984b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,12 @@ services: depends_on: nocr-rabbitmq: condition: service_healthy + nocr-users: + condition: service_healthy + nocr-text-matcher: + condition: service_healthy + nocr-telegram-listener: + condition:service_healthy nocr-text-matcher: container_name: nocr-text-matcher @@ -37,6 +43,18 @@ services: nocr-rabbitmq: condition: service_healthy + nocr-users: + container_name: nocr-users + image: nocr-users:latest + build: + context: users + dockerfile: src/Nocr.Users.Host/Dockerfile + environment: + ASPNETCORE_ENVIRONMENT: DockerCompose + depends_on: + nocr-rabbitmq: + condition: service_healthy + nocr-rabbitmq: image: rabbitmq:3-management-alpine container_name: nocr-rabbitmq diff --git a/users b/users index a0626b2..e7e2610 160000 --- a/users +++ b/users @@ -1 +1 @@ -Subproject commit a0626b25d7b68f2919eab5784c700bc20a7ac15f +Subproject commit e7e2610da1d8c14b0f7cf5fa2643a793a89e19c3