diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 0e62be3d90..fb3ee14528 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -6,6 +6,7 @@ on: branches: - main - dev + - changes tags: - v* diff --git a/.github/workflows/release-aws-ecr.yml b/.github/workflows/release-aws-ecr.yml index 4ab1fa010e..bf6d6fb4c2 100644 --- a/.github/workflows/release-aws-ecr.yml +++ b/.github/workflows/release-aws-ecr.yml @@ -41,11 +41,11 @@ jobs: with: role-to-assume: ${{ vars.MLPOC_BRUKER_GH_ROLE_ARN }} role-session-name: DNA-Automation-Github-Actions-Session - aws-region: ${{ github.even.inputs.region }} + aws-region: ap-southeast-2 - name: ☁️ Login to Amazon ECR id: login-ecr uses: aws-actions/amazon-ecr-login@v1 - name: 🐳 Tag and push docker image to Amazon ECR run: | - docker tag ghcr.io/rio-tinto/open-webui:${{ github.event.inputs.source_docker_tag }} ${{ github.even.inputs.account_id }}.dkr.ecr.${{ github.even.inputs.region }}.amazonaws.com/open-webui:${{ github.event.inputs.destination_docker_tag }} - docker push ${{ github.even.inputs.account_id }}.dkr.ecr.${{ github.even.inputs.region }}.amazonaws.com/open-webui:${{ github.event.inputs.destination_docker_tag }} \ No newline at end of file + docker tag ghcr.io/rio-tinto/open-webui:${{ github.event.inputs.source_docker_tag }} ${{ github.event.inputs.account_id }}.dkr.ecr.${{ github.event.inputs.region }}.amazonaws.com/open-webui:${{ github.event.inputs.destination_docker_tag }} + docker push ${{ github.event.inputs.account_id }}.dkr.ecr.${{ github.event.inputs.region }}.amazonaws.com/open-webui:${{ github.event.inputs.destination_docker_tag }} \ No newline at end of file diff --git a/backend/apps/webui/routers/auths.py b/backend/apps/webui/routers/auths.py index 9676f78b56..e68cad7f00 100644 --- a/backend/apps/webui/routers/auths.py +++ b/backend/apps/webui/routers/auths.py @@ -132,7 +132,7 @@ async def signin(request: Request, response: Response, form_data: SigninForm): trusted_email = decode_token_from_alb(jwt)["email"] trusted_email = trusted_email.lower() trusted_name = trusted_email - + if WEBUI_AUTH_TRUSTED_NAME_HEADER: trusted_name = request.headers.get( WEBUI_AUTH_TRUSTED_NAME_HEADER, trusted_email diff --git a/backend/static/favicon.png b/backend/static/favicon.png index 2b20747808..fa631112ae 100644 Binary files a/backend/static/favicon.png and b/backend/static/favicon.png differ diff --git a/backend/static/logo.png b/backend/static/logo.png index 519af1db62..362c2540c6 100644 Binary files a/backend/static/logo.png and b/backend/static/logo.png differ diff --git a/backend/static/splash.png b/backend/static/splash.png index 389196ca6a..87a86b7208 100644 Binary files a/backend/static/splash.png and b/backend/static/splash.png differ diff --git a/backend/utils/utils.py b/backend/utils/utils.py index ddac6f2181..0a92ddcde0 100644 --- a/backend/utils/utils.py +++ b/backend/utils/utils.py @@ -54,7 +54,7 @@ def decode_token(token: str) -> Optional[dict]: except Exception: return None - + def decode_token_from_alb(token: str) -> Optional[dict]: try: payload = jwt.decode(token, options={"verify_signature": False}) diff --git a/static/favicon.png b/static/favicon.png index 2b20747808..fa631112ae 100644 Binary files a/static/favicon.png and b/static/favicon.png differ diff --git a/static/static/favicon.png b/static/static/favicon.png index 2b20747808..fa631112ae 100644 Binary files a/static/static/favicon.png and b/static/static/favicon.png differ diff --git a/static/static/splash-dark.png b/static/static/splash-dark.png index 202c03f8e4..87a86b7208 100644 Binary files a/static/static/splash-dark.png and b/static/static/splash-dark.png differ diff --git a/static/static/splash.png b/static/static/splash.png index 389196ca6a..87a86b7208 100644 Binary files a/static/static/splash.png and b/static/static/splash.png differ