diff --git a/.env b/.env index 9910b30..d01cee6 100644 --- a/.env +++ b/.env @@ -8,4 +8,5 @@ MYSQL_PASSWORD=phai4Eeghequohyoowie MLTORGTRANS_TAG=master -mlatrucks_tag=master \ No newline at end of file +mlatrucks_tag=master +mltorgtrans_abinbevefes=master diff --git a/configs/mltorgtrans_abinbevefes/.env b/configs/mltorgtrans_abinbevefes/.env new file mode 100644 index 0000000..68c9eb1 --- /dev/null +++ b/configs/mltorgtrans_abinbevefes/.env @@ -0,0 +1,68 @@ +APP_NAME="DOT-DOT torgtrans" +APP_ENV=production +APP_KEY=base64:Ze21k0MSmCRmT0kc4Mf8pYsViTm8rJBvvx2FV7MkVzk= +APP_DEBUG=false +APP_TIMEZONE=UTC +APP_URL=http://localhost +APP_EMAIL_DOMAIN="dot-dot.ru" + +APP_LOCALE=ru +APP_FALLBACK_LOCALE=ru +APP_FAKER_LOCALE=ru_RU + +APP_MAINTENANCE_DRIVER=file +# APP_MAINTENANCE_STORE=database + +BCRYPT_ROUNDS=12 + +LOG_CHANNEL=stack +LOG_STACK=single +LOG_DEPRECATIONS_CHANNEL=null +LOG_LEVEL=debug + +DEFAULT_DB_CONNECTION=default + +#Параметры подключения к базе +DB_HOST=db +DB_PORT=3306 +DB_DATABASE=ml_torgtrans_abinbevefes +DB_USERNAME=root +DB_PASSWORD=iis5YohThe2xahch8sah + +SESSION_DRIVER=database +SESSION_LIFETIME=120 +SESSION_ENCRYPT=false +SESSION_PATH=/ +SESSION_DOMAIN=null + +BROADCAST_CONNECTION=log +FILESYSTEM_DISK=local +QUEUE_CONNECTION=database + +CACHE_STORE=database +CACHE_PREFIX= + +# MEMCACHED_HOST=127.0.0.1 + +REDIS_CLIENT=phpredis +REDIS_HOST=redis +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_MAILER=log +MAIL_HOST=127.0.0.1 +MAIL_PORT=2525 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS="hello@example.com" +MAIL_FROM_NAME="${APP_NAME}" + +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_DEFAULT_REGION=us-east-1 +AWS_BUCKET= +AWS_USE_PATH_STYLE_ENDPOINT=false + +VITE_APP_NAME="${APP_NAME}" +DOT_DOT_HOST=http://dot-dot.local \ No newline at end of file diff --git a/configs/nginx/conf.d/dagster.dot-dot.ru.conf b/configs/nginx/conf.d/dagster.dot-dot.ru.conf index 4cfa1a5..86bb10c 100644 --- a/configs/nginx/conf.d/dagster.dot-dot.ru.conf +++ b/configs/nginx/conf.d/dagster.dot-dot.ru.conf @@ -8,8 +8,8 @@ server { listen 443 ssl; server_name dagster.dot-dot.ru; - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; + ssl_certificate /etc/nginx/ssl/dot2025.crt; + ssl_certificate_key /etc/nginx/ssl/dot2025.key; location / { proxy_pass http://dagster:3000; diff --git a/configs/nginx/conf.d/ml-staging.dot-dot.ru.conf b/configs/nginx/conf.d/ml-staging.dot-dot.ru.conf index 7c60eb8..25ea0e3 100644 --- a/configs/nginx/conf.d/ml-staging.dot-dot.ru.conf +++ b/configs/nginx/conf.d/ml-staging.dot-dot.ru.conf @@ -8,8 +8,8 @@ server { listen 443 ssl; server_name ml-api-staging.dot-dot.ru; - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; + ssl_certificate /etc/nginx/ssl/dot2025.crt; + ssl_certificate_key /etc/nginx/ssl/dot2025.key; location / { proxy_pass http://ml-api-staging:8080; diff --git a/configs/nginx/conf.d/ml.dot-dot.ru.conf b/configs/nginx/conf.d/ml.dot-dot.ru.conf index b74372a..1c500fb 100644 --- a/configs/nginx/conf.d/ml.dot-dot.ru.conf +++ b/configs/nginx/conf.d/ml.dot-dot.ru.conf @@ -8,8 +8,8 @@ server { listen 443 ssl; server_name ml.dot-dot.ru; - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; + ssl_certificate /etc/nginx/ssl/dot2025.crt; + ssl_certificate_key /etc/nginx/ssl/dot2025.key; location / { proxy_pass http://ml-api:8080; @@ -23,6 +23,18 @@ server { proxy_cache off; } + location /cadvisor { + proxy_pass http://cadvisor:8080/metrics; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + chunked_transfer_encoding off; + proxy_buffering off; + proxy_cache off; + } + location /metrics { proxy_pass http://node-exporter:9100; proxy_http_version 1.1; @@ -35,8 +47,8 @@ server { proxy_cache off; } - location /cadvisor { - proxy_pass http://cadvisor:8080/metrics; + location /ml-api/metrics { + proxy_pass http://ml-api:8080/metrics; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; @@ -46,4 +58,4 @@ server { proxy_buffering off; proxy_cache off; } -} \ No newline at end of file +} diff --git a/configs/nginx/conf.d/mlflow.dot-dot.ru.conf b/configs/nginx/conf.d/mlflow.dot-dot.ru.conf index e312ca7..4849199 100644 --- a/configs/nginx/conf.d/mlflow.dot-dot.ru.conf +++ b/configs/nginx/conf.d/mlflow.dot-dot.ru.conf @@ -8,8 +8,8 @@ server { listen 443 ssl; server_name mlflow.dot-dot.ru; - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; + ssl_certificate /etc/nginx/ssl/dot2025.crt; + ssl_certificate_key /etc/nginx/ssl/dot2025.key; location / { client_max_body_size 600m; diff --git a/configs/nginx/conf.d/superset.dot-dot.ru.conf b/configs/nginx/conf.d/superset.dot-dot.ru.conf index f362f6d..91a83b9 100644 --- a/configs/nginx/conf.d/superset.dot-dot.ru.conf +++ b/configs/nginx/conf.d/superset.dot-dot.ru.conf @@ -8,8 +8,8 @@ server { listen 443 ssl; server_name superset.dot-dot.ru; - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; + ssl_certificate /etc/nginx/ssl/dot2025.crt; + ssl_certificate_key /etc/nginx/ssl/dot2025.key; location / { proxy_pass http://superset_nginx:80; diff --git a/configs/nginx/conf.d/torchserve.dot-dot.ru.conf b/configs/nginx/conf.d/torchserve.dot-dot.ru.conf deleted file mode 100644 index 39bf046..0000000 --- a/configs/nginx/conf.d/torchserve.dot-dot.ru.conf +++ /dev/null @@ -1,64 +0,0 @@ -server { - listen 80; - server_name torchserve.dot-dot.ru; - return 301 https://$server_name$request_uri; -} - -server { - listen 443 ssl; - server_name torchserve.dot-dot.ru; - - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; - - location / { - proxy_pass http://torchserve:8080; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - chunked_transfer_encoding off; - proxy_buffering off; - proxy_cache off; - } - - location /metrics { - proxy_pass http://torchserve:8082; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - chunked_transfer_encoding off; - proxy_buffering off; - proxy_cache off; - } - -} - -server { - listen 80; - server_name tmanagement.dot-dot.ru; - return 301 https://$server_name$request_uri; -} - -server { - listen 443 ssl; - server_name tmanagement.dot-dot.ru; - - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; - - location / { - proxy_pass http://torchserve:8081; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - chunked_transfer_encoding off; - proxy_buffering off; - proxy_cache off; - } -} \ No newline at end of file diff --git a/configs/nginx/ssl/dot2025.crt b/configs/nginx/ssl/dot2025.crt new file mode 100644 index 0000000..b3ef97a --- /dev/null +++ b/configs/nginx/ssl/dot2025.crt @@ -0,0 +1,107 @@ +-----BEGIN CERTIFICATE----- +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 +DIQhj8h1rzW2eyc= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFjTCCA3WgAwIBAgIRAIN9TriekS/nLK07x2kt3CAwDQYJKoZIhvcNAQELBQAw +TDEgMB4GA1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkds +b2JhbFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMjUwNTIxMDIzNjUyWhcN +MjcwNTIxMDAwMDAwWjBVMQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2ln +biBudi1zYTErMCkGA1UEAxMiR2xvYmFsU2lnbiBHQ0MgUjYgQWxwaGFTU0wgQ0Eg +MjAyNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ/oiu0Bviq52UUE +ADbFWmgu3rC7KDSMoorLN1Wd03McG3Z1aP71DlPCE33838r72Dfuj5M9LXfiQLJp +Au6MwNExmKOzothw4x0zGf5oBYyrCMGm3fBpLPafwYQ3MchBOWMTbf83rKUPLH48 +KCJ0MnU8GUl8oA/J81wIvbbKPuNrFf6hvJDccjzc4NyxLz3A89zjV2g5whCg5O0u +9YX4Zxk9JHuc/LvllOJO4waAYLjbWBJkz3rV3ts1SmSYnJqmyRTIjXwQgRvhEYqt +DbRskt0W7M6cPwCze3GTBN2UHNpHkMs3YmVxku68I0aOQn5+uz//fDROP3z1Z/7I +APteRtECAwEAAaOCAV8wggFbMA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggr +BgEFBQcDAQYIKwYBBQUHAwIwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQU +xbSTj28r3B5Iv7cQMIXO0bK7SC0wHwYDVR0jBBgwFoAUrmwFo5MT4qLn4tcc1sfw +f8hnU6AwewYIKwYBBQUHAQEEbzBtMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcDIu +Z2xvYmFsc2lnbi5jb20vcm9vdHI2MDsGCCsGAQUFBzAChi9odHRwOi8vc2VjdXJl +Lmdsb2JhbHNpZ24uY29tL2NhY2VydC9yb290LXI2LmNydDA2BgNVHR8ELzAtMCug +KaAnhiVodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL3Jvb3QtcjYuY3JsMCEGA1Ud +IAQaMBgwCAYGZ4EMAQIBMAwGCisGAQQBoDIKAQMwDQYJKoZIhvcNAQELBQADggIB +AB/uvBuZf4CiuSahwiXn4geF52roAH+6jxsEPTXTfb7bbeMDXsYgRRsOTNA70ruZ +Tnz5DfFMuBhNoFhIFb0qR1izdy6VkdKOqFPNF2dOFI1EcnY9l2ory9mrzHqVbrL4 +vzUd17FLUVyjTVU7PAv4nxyhnO1GTeT83YlrdRF31NyR6bvZVTEERHmpbWSgeveJ +LRtaMzlGWiLZ8IwkH7o6GH3jp/KPtDW4Npu8w64HrRZdN2pqQhi7+YKwfHM7H+2U +dM1BGN0sjOWMVbMSB9MtCsleS2Mb7TRZEbOHxECJLLIluQypZr7Pol3+hAqrhyKI +k+6y+Da0NeDuWxW59Ku4NvClqW1UFX1SpfNGhzVfp/CH+vPM1tySomx2jE0EnYZu +GwVucXPBsp5nUWqUV9+143glVuS7GTg9hFPjNBInn17HbCoIIQIOzj5Vd9bK3A9U +GxXNpwenDHEalCsD/4eQYDHPhFE7sNe0D/OXu+FAM02VZkARx37Jp4bDdujvgL9P +vZPR3wThvDN1CTU8Bc3xea3yKFAraKcPZLkhReQUAm2VpR+HSJRPlUpYizlF9WkL +h3KcAVCBJWvnOkVwxyU5QJMcnwW95JlOtx+9100GL99jHE5rs3gXp7F4bg8H01QT +9jVOhBBmQ7nQoXuwI0tqal2QUqZz3eeu62CU7xBwtfYR +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEg +MB4GA1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2Jh +bFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQx +MjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjET +MBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCAiIwDQYJ +KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQssgrRI +xutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1k +ZguSgMpE3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxD +aNc9PIrFsmbVkJq3MQbFvuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJw +LnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqMPKq0pPbzlUoSB239jLKJz9CgYXfIWHSw +1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+azayOeSsJDa38O+2HBNX +k7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05OWgtH8wY2 +SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/h +bguyCLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4n +WUx2OVvq+aWh2IMP0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpY +rZxCRXluDocZXFSxZba/jJvcE+kNb7gu3GduyYsRtYQUigAZcIN5kZeR1Bonvzce +MgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTAD +AQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNVHSMEGDAWgBSu +bAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN +nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGt +Ixg93eFyRJa0lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr61 +55wsTLxDKZmOMNOsIeDjHfrYBzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLj +vUYAGm0CuiVdjaExUd1URhxN25mW7xocBFymFe944Hn+Xds+qkxV/ZoVqW/hpvvf +cDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr3TsTjxKM4kEaSHpz +oHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB10jZp +nOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfs +pA9MRf/TuTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+v +JJUEeKgDu+6B5dpffItKoZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R +8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+tJDfLRVpOoERIyNiwmcUVhAn21klJwGW4 +5hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA= +-----END CERTIFICATE----- diff --git a/configs/nginx/ssl/dot2025.key b/configs/nginx/ssl/dot2025.key new file mode 100644 index 0000000..a8fd5ac --- /dev/null +++ b/configs/nginx/ssl/dot2025.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/configs/traefik/conf.d/global.yml b/configs/traefik/conf.d/global.yml index 034e570..420e239 100644 --- a/configs/traefik/conf.d/global.yml +++ b/configs/traefik/conf.d/global.yml @@ -5,8 +5,8 @@ tls: stores: default: defaultCertificate: - certFile: /conf.d/dot2024.crt - keyFile: /conf.d/dot2024.key + certFile: /conf.d/dot2025.crt + keyFile: /conf.d/dot2025.key http: middlewares: global-chain: diff --git a/docker-compose.yml b/docker-compose.yml index 5e9016d..4339eda 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,7 @@ volumes: nginx_log_volume: mysql_data_volume: mysql_backup_volume: + mltorgtrans_abinbevefes_log: networks: @@ -27,44 +28,82 @@ services: ingress: - php-cli-mltorgtrans: + mltorgtrans: user: 1000:1000 image: registry.dot-dot.ru/mltorgtrans:${MLTORGTRANS_TAG} - command: php artisan app:run-collector 6d7867e74c767c5c81545d38f4ab3113 restart: unless-stopped volumes: - ./configs/mltorgtrans/.env:/application/.env env_file: - ./configs/mltorgtrans/.env - networks: - ingress: - - - mlatrucks: - image: registry.dot-dot.ru/mlatrucks:${mlatrucks_tag} - command: php artisan app:run-collector pPHx1yZOaiOsUb0zAIaoiY0B4SLOcyS8gBYaAxvI9RVSAR6u - restart: unless-stopped - volumes: - - ./configs/mlatrucks/.env:/application/.env - env_file: - - ./configs/mlatrucks/.env depends_on: - mlatrucks_db_migration: + mltorgtrans_db_migration: condition: service_completed_successfully networks: ingress: - mlatrucks_db_migration: - image: registry.dot-dot.ru/mlatrucks:${mlatrucks_tag} + mltorgtrans_db_migration: + image: registry.dot-dot.ru/mltorgtrans:${MLTORGTRANS_TAG} command: /application/artisan migrate --force --no-interaction volumes: - - ./configs/mlatrucks/.env:/application/.env + - ./configs/mltorgtrans/.env:/application/.env env_file: - - ./configs/mlatrucks/.env + - ./configs/mltorgtrans/.env networks: ingress: {} + mltorgtrans_abinbevefes: + user: 1000:1000 + image: registry.dot-dot.ru/mltorgtrans_abinbevefes:${mltorgtrans_abinbevefes} + restart: unless-stopped + volumes: + - ./configs/mltorgtrans_abinbevefes/.env:/application/.env + - mltorgtrans_abinbevefes_log:/application/storage/logs + env_file: + - ./configs/mltorgtrans_abinbevefes/.env + depends_on: + mltorgtrans_abinbevefes_db_migration: + condition: service_completed_successfully + networks: + ingress: + + + mltorgtrans_abinbevefes_db_migration: + image: registry.dot-dot.ru/mltorgtrans_abinbevefes:${mltorgtrans_abinbevefes} + command: /application/artisan migrate --force --no-interaction + volumes: + - ./configs/mltorgtrans_abinbevefes/.env:/application/.env + env_file: + - ./configs/mltorgtrans_abinbevefes/.env + networks: + ingress: {} + +# mlatrucks: +# image: registry.dot-dot.ru/mlatrucks:${mlatrucks_tag} +# command: php artisan app:run-collector pPHx1yZOaiOsUb0zAIaoiY0B4SLOcyS8gBYaAxvI9RVSAR6u +# restart: unless-stopped +# volumes: +# - ./configs/mlatrucks/.env:/application/.env +# env_file: +# - ./configs/mlatrucks/.env +# depends_on: +# mlatrucks_db_migration: +# condition: service_completed_successfully +# networks: +# ingress: + + +# mlatrucks_db_migration: +# image: registry.dot-dot.ru/mlatrucks:${mlatrucks_tag} +# command: /application/artisan migrate --force --no-interaction +# volumes: +# - ./configs/mlatrucks/.env:/application/.env +# env_file: +# - ./configs/mlatrucks/.env +# networks: +# ingress: {} + nginx: image: nginx:1.25.3-alpine3.18 restart: unless-stopped