From 7107a50d58ff17b9edeb8f96677313addb25b718 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 13 Jun 2026 14:04:50 -0400 Subject: [PATCH] Update name (#7) Reviewed-on: http://git.kundeng.us/phoenix/textsender_api/pulls/7 --- .dockerignore.yaml | 4 ++-- .gitea/workflows/workflow.yml | 3 ++- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- docker-compose.yml | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.dockerignore.yaml b/.dockerignore.yaml index 1c47491..95f2e30 100644 --- a/.dockerignore.yaml +++ b/.dockerignore.yaml @@ -1,5 +1,3 @@ -vendor/ - # Ignore git directory .git/ @@ -7,3 +5,5 @@ vendor/ # Ignore environment files (configure via docker-compose instead) .env* + +target/ diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index f8883a7..ba4c8ca 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -43,6 +43,7 @@ jobs: POSTGRES_USER: ${{ secrets.DB_TEST_USER || 'testuser' }} POSTGRES_PASSWORD: ${{ secrets.DB_TEST_PASSWORD || 'testpassword' }} POSTGRES_DB: ${{ secrets.DB_TEST_NAME || 'testdb' }} + POSTGRES_PORT: ${{ secrets.DB_PORT || 5432 }} # Options to wait until the database is ready options: >- --health-cmd pg_isready @@ -72,7 +73,7 @@ jobs: - name: Run tests env: # Define DATABASE_URL for tests to use - DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:5432/${{ secrets.DB_TEST_NAME || 'testdb' }} + DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:${{ secrets.DB_PORT || 5432 }}/${{ secrets.DB_TEST_NAME || 'testdb' }} RUST_LOG: info # Optional: configure test log level SECRET_KEY: ${{ secrets.SECRET_KEY }} # Make SSH agent available if tests fetch private dependencies diff --git a/Cargo.lock b/Cargo.lock index 649fe00..64b2264 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2295,7 +2295,7 @@ dependencies = [ [[package]] name = "textsender_api" -version = "0.5.0" +version = "0.1.3" dependencies = [ "axum", "axum-extra", @@ -2326,7 +2326,7 @@ dependencies = [ [[package]] name = "textsender_models" version = "0.3.0" -source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.3.0#d504108745b7b97a02eac24e16763cdb5e731f2b" +source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.3.0#d504108745b7b97a02eac24e16763cdb5e731f2b" dependencies = [ "const_format", "dotenvy", diff --git a/Cargo.toml b/Cargo.toml index 4d327e3..eb85782 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "textsender_api" -version = "0.5.0" +version = "0.1.3" edition = "2024" rust-version = "1.95" @@ -25,7 +25,7 @@ jsonwebtoken = { version = "10.3.0", features = ["rust_crypto"] } josekit = { version = "0.10.3" } utoipa = { version = "5.5.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } -textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.3.0" } +textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.3.0" } [dev-dependencies] common-multipart-rfc7578 = { version = "0.7.0" } diff --git a/docker-compose.yml b/docker-compose.yml index 0f0221a..56a3f79 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,8 +22,8 @@ services: # --- Web API auth --- auth_api: build: - # Might want to change the naming convention at some point for the repo names. textsender-models, textsender-auth, textesender-api, etc - context: ../textsender-auth # IMPORTANT: Relative path to the local checkout of your web API repo (containing the Dockerfile) + # Might want to change the naming convention at some point for the repo names. textsender-models, textsender_auth, textesender-api, etc + context: ../textsender_auth # IMPORTANT: Relative path to the local checkout of your web API repo (containing the Dockerfile) ssh: ["default"] # Uses host's SSH agent dockerfile: Dockerfile # Optional: Specify if your Dockerfile has a non-standard name container_name: auth_api @@ -34,7 +34,7 @@ services: # Environment variables your API needs, e.g., database connection # Add other necessary environment variables env_file: - - ../textsender-auth/.env + - ../textsender_auth/.env depends_on: auth_db: condition: service_healthy