From ee41fbab9694224d4772dd547e1813c6a9b580b0 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Dec 2024 20:27:56 -0500 Subject: [PATCH 1/3] dockerhub name change --- .github/workflows/production.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 1d6d27bb0..5b2e1a1e6 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -70,15 +70,15 @@ jobs: uses: docker/build-push-action@v5 with: push: true - tags: woffee/wis_club_api:${{ github.sha }} # Uses the Git SHA for tagging + tags: rnb2/is218:${{ github.sha }} # Uses the Git SHA for tagging platforms: linux/amd64,linux/arm64 # Multi-platform support - cache-from: type=registry,ref=woffee/wis_club_api:cache + cache-from: type=registry,ref=rnb2offee/is218:cache cache-to: type=inline,mode=max - name: Scan the Docker image uses: aquasecurity/trivy-action@master with: - image-ref: 'woffee/wis_club_api:${{ github.sha }}' + image-ref: 'rnb2/is218:${{ github.sha }}' format: 'table' exit-code: '1' # Fail the job if vulnerabilities are found ignore-unfixed: true From 36439f03d573df51f01f3a7cb2b94e7bc2403678 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Dec 2024 21:45:22 -0500 Subject: [PATCH 2/3] trying to fix login issue with username with email and updating yml --- .github/workflows/production.yml | 2 +- tests/conftest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 5b2e1a1e6..85f97773c 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -72,7 +72,7 @@ jobs: push: true tags: rnb2/is218:${{ github.sha }} # Uses the Git SHA for tagging platforms: linux/amd64,linux/arm64 # Multi-platform support - cache-from: type=registry,ref=rnb2offee/is218:cache + cache-from: type=registry,ref=rnb2/is218:cache cache-to: type=inline,mode=max - name: Scan the Docker image diff --git a/tests/conftest.py b/tests/conftest.py index 6bd7998ac..a4c801db0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -260,4 +260,4 @@ def user_response_data(): @pytest.fixture def login_request_data(): - return {"username": "john_doe_123", "password": "SecurePassword123!"} \ No newline at end of file + return {"email": "john.doe.new@example.com", "password": "SecurePassword123!"} \ No newline at end of file From 72d067492aeead13772dd22e350a87ae368ee368 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Dec 2024 21:54:41 -0500 Subject: [PATCH 3/3] fixing the fix --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 9b0d27151..a0a0140ab 100644 --- a/readme.md +++ b/readme.md @@ -62,7 +62,7 @@ docker compose exec fastapi alembic revision --autogenerate -m 'added admin' ### Apply database migrations: ``` -docker compose exec fastapi alembic upgrade head +docker compose exec fastapi alembic upgrade head ``` ## Assignment Objectives