diff --git a/core.git b/core.git deleted file mode 100755 index ec231c9..0000000 Binary files a/core.git and /dev/null differ diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index 9dfd396..f67de88 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -5,14 +5,14 @@ services: image: $CI_REGISTRY_IMAGE/staging-core:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID tty: true environment: - HUB_ADMIN_URL: 'http://10.6.0.11:59303' + HUB_ADMIN_URL: 'http://10.8.0.6:59303' IS_PROD_LOG: 'false' IS_PROD: 'false' PORT: 1488 PUBLIC_ACCESS_SECRET_KEY: $JWT_PUBLIC_KEY - PG_CRED: 'host=10.6.0.23 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable' - AUTH_URL: 'http://10.6.0.11:59300/user' + PG_CRED: 'host=10.8.0.5 port=5433 user=squiz password=Redalert2 dbname=squiz sslmode=disable' + AUTH_URL: 'http://10.8.0.6:59300/user' PUBLIC_KEY: $PEM_PUB_USERID PRIVATE_KEY: $PEM_PRIV_USERID ports: - - 1488:1488 + - 10.8.0.5:1488:1488 diff --git a/go.mod b/go.mod index e6d94c7..e940437 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/xuri/excelize/v2 v2.8.1 go.uber.org/zap v1.27.0 penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240223054633-6cb3d5ce45b6 - penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240416222807-5b57148b0106 + penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240423102606-60b55541d67e penahub.gitlab.yandexcloud.net/backend/quiz/worker.git v0.0.0-20240313171802-7da5fbb4caf3 ) @@ -27,7 +27,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/fatih/color v1.10.0 // indirect github.com/go-redis/redis/v8 v8.11.5 // indirect - github.com/golang-migrate/migrate/v4 v4.17.0 // indirect + github.com/golang-migrate/migrate/v4 v4.17.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect diff --git a/go.sum b/go.sum index 698c458..1a34fd9 100644 --- a/go.sum +++ b/go.sum @@ -38,6 +38,8 @@ github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17w github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-migrate/migrate/v4 v4.17.0 h1:rd40H3QXU0AA4IoLllFcEAEo9dYKRHYND2gB4p7xcaU= github.com/golang-migrate/migrate/v4 v4.17.0/go.mod h1:+Cp2mtLP4/aXDTKb9wmXYitdrNx2HGs45rbWAo6OsKM= +github.com/golang-migrate/migrate/v4 v4.17.1 h1:4zQ6iqL6t6AiItphxJctQb3cFqWiSpMnX7wLTPnnYO4= +github.com/golang-migrate/migrate/v4 v4.17.1/go.mod h1:m8hinFyWBn0SA4QKHuKh175Pm9wjmxj3S2Mia7dbXzM= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -299,5 +301,7 @@ penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240416222025-e5b penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240416222025-e5ba6630d682/go.mod h1:/DcyAjBh41IbomuDu5QzhL9flZW6lWO3ZAEbUXKobk0= penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240416222807-5b57148b0106 h1:LWCZW9FrueZjs15fY1rPgY23NhBjDpK5zQrKvCmLwnk= penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240416222807-5b57148b0106/go.mod h1:/DcyAjBh41IbomuDu5QzhL9flZW6lWO3ZAEbUXKobk0= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240423102606-60b55541d67e h1:2xfRZBAMjlhIu5lIDUSsi43in9zVfoLsCNE/sbEXvKw= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240423102606-60b55541d67e/go.mod h1:/DcyAjBh41IbomuDu5QzhL9flZW6lWO3ZAEbUXKobk0= penahub.gitlab.yandexcloud.net/backend/quiz/worker.git v0.0.0-20240313171802-7da5fbb4caf3 h1:BLHIUnJAttW9OAW7A63H9ON/HPhXdpBa/YPUQWD4ORA= penahub.gitlab.yandexcloud.net/backend/quiz/worker.git v0.0.0-20240313171802-7da5fbb4caf3/go.mod h1:/BFcX4F10DRuFuAHlwkKO+1QAXPL4i49x1tsrTwxlqE=