From 9b3f4f8bfd95c8a05ab780886287450e03cdaf76 Mon Sep 17 00:00:00 2001 From: leehk Date: Thu, 17 Apr 2025 13:56:05 +0800 Subject: [PATCH 1/3] update --- .github/workflows/build.yml | 2 ++ .github/workflows/template_build.yml | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce6a484..ebd686a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,6 +37,7 @@ jobs: - IMAGE_NAME: backend-aimingmedai BUILD_CONTEXT: ./app/backend DOCKERFILE: ./app/backend/Dockerfile.prod + ARGS: "--build-arg ENVIRONMENT=dev --build-arg TESTING=1 --build-arg DEEPSEEK_API_KEY=sk-XXXXXXXXXX --build-arg TAVILY_API_KEY=tvly-dev-wXXXXXX" - IMAGE_NAME: frontend-aimingmedai BUILD_CONTEXT: ./app/frontend DOCKERFILE: ./app/frontend/Dockerfile.test @@ -54,6 +55,7 @@ jobs: image_name: ${{ matrix.image_config.IMAGE_NAME }} build_context: ${{ matrix.image_config.BUILD_CONTEXT }} dockerfile: ${{ matrix.image_config.DOCKERFILE }} + args: ${{ matrix.image_config.ARGS }} build_id: ${{ github.run_id }} commit_sha: ${{ github.sha }} diff --git a/.github/workflows/template_build.yml b/.github/workflows/template_build.yml index 455a0aa..bf10072 100644 --- a/.github/workflows/template_build.yml +++ b/.github/workflows/template_build.yml @@ -25,6 +25,10 @@ on: commit_sha: required: true type: string + args: + required: false + type: string + jobs: build-single-image: From 57802e0f416969cdea21a59b2921daf1916ddd62 Mon Sep 17 00:00:00 2001 From: leehk Date: Thu, 17 Apr 2025 14:08:00 +0800 Subject: [PATCH 2/3] removed and add api to dockerfile --- .github/workflows/build.yml | 2 -- .github/workflows/template_build.yml | 6 +----- app/backend/Dockerfile.prod | 2 ++ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ebd686a..ce6a484 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,6 @@ jobs: - IMAGE_NAME: backend-aimingmedai BUILD_CONTEXT: ./app/backend DOCKERFILE: ./app/backend/Dockerfile.prod - ARGS: "--build-arg ENVIRONMENT=dev --build-arg TESTING=1 --build-arg DEEPSEEK_API_KEY=sk-XXXXXXXXXX --build-arg TAVILY_API_KEY=tvly-dev-wXXXXXX" - IMAGE_NAME: frontend-aimingmedai BUILD_CONTEXT: ./app/frontend DOCKERFILE: ./app/frontend/Dockerfile.test @@ -55,7 +54,6 @@ jobs: image_name: ${{ matrix.image_config.IMAGE_NAME }} build_context: ${{ matrix.image_config.BUILD_CONTEXT }} dockerfile: ${{ matrix.image_config.DOCKERFILE }} - args: ${{ matrix.image_config.ARGS }} build_id: ${{ github.run_id }} commit_sha: ${{ github.sha }} diff --git a/.github/workflows/template_build.yml b/.github/workflows/template_build.yml index bf10072..811902c 100644 --- a/.github/workflows/template_build.yml +++ b/.github/workflows/template_build.yml @@ -25,10 +25,7 @@ on: commit_sha: required: true type: string - args: - required: false - type: string - + jobs: build-single-image: @@ -94,7 +91,6 @@ jobs: -t ${{ steps.tags.outputs.image_repo_path }}:${{ steps.tags.outputs.tag_build_id }} \ -t ${{ steps.tags.outputs.image_repo_path }}:${{ steps.tags.outputs.tag_commit_sha }} \ -t ${{ steps.tags.outputs.image_repo_path }}:latest \ - ${{ inputs.args }} \ ${{ inputs.build_context }} - name: Push Final Image Tags diff --git a/app/backend/Dockerfile.prod b/app/backend/Dockerfile.prod index a6571a6..678c71d 100644 --- a/app/backend/Dockerfile.prod +++ b/app/backend/Dockerfile.prod @@ -13,6 +13,8 @@ ENV PYTHONDONTWRITEBYTECODE=1 ENV PYTHONUNBUFFERED=1 ENV ENVIRONMENT=dev ENV TESTING=1 +ENV DEEPSEEK_API_KEY=sk-XXXXXXXXXX +ENV TAVILY_API_KEY=tvly-dev-wXXXXXX # install python dependencies RUN pip install -i https://pypi.tuna.tsinghua.edu.cn/simple pipenv && rm -rf ~/.cache/pip From 92b5c2e6928f50ef628f512d880396106a0f9b33 Mon Sep 17 00:00:00 2001 From: leehk Date: Thu, 17 Apr 2025 14:30:33 +0800 Subject: [PATCH 3/3] update --- app/backend/Dockerfile.prod | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/backend/Dockerfile.prod b/app/backend/Dockerfile.prod index 678c71d..0b425b5 100644 --- a/app/backend/Dockerfile.prod +++ b/app/backend/Dockerfile.prod @@ -23,7 +23,8 @@ RUN pipenv install --deploy --dev # add app COPY . /usr/src/app -RUN pipenv run pytest tests --disable-warnings +RUN export DEEPSEEK_API_KEY=sk-XXXXXXXXXX; export TAVILY_API_KEY=tvly-dev-wXXXXXX;\ + pipenv run pytest tests --disable-warnings RUN pipenv run flake8 . RUN pipenv run black --exclude=migrations . --check RUN pipenv run isort . --check-only