diff --git a/.github/workflows/release-aws-ecr.yml b/.github/workflows/release-aws-ecr.yml new file mode 100644 index 0000000000..05dd2ef41c --- /dev/null +++ b/.github/workflows/release-aws-ecr.yml @@ -0,0 +1,66 @@ +name: Release to AWS MLPoC ECR + +on: + workflow_dispatch: + inputs: + source_docker_tag: + description: 'Source Image Tag' + required: true + default: 'latest' + destination_docker_tag: + description: 'Destination Image Tag' + required: true + default: 'latest' + account_id: + description: 'AWS Account ID' + region: + description: 'AWS Region' + role_to_assume: + description: 'AWS Role ARN' + +jobs: + release: + runs-on: ubuntu-latest + environment: + name: aws-ecr + url: https://aws.amazon.com/ecr/ + permissions: + id-token: write + steps: + - name: 👨‍💻 Checkout repository + uses: actions/checkout@v4 + - name: 'Login to GitHub Container Registry' + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{github.actor}} + password: ${{secrets.DOCKER_CONTAINER_REGISTRY_TOKEN}} + - name: 🐳 Pull Image + run: | + docker pull ghcr.io/rio-tinto/open-webui:${{ github.event.inputs.source_docker_tag }} + - name: ☁️ Set AWS Role ARN + id: set-role-arn + run: | + if [[ "${{ github.event.inputs.role_to_assume }}" == "scdev" ]]; then + echo "role_arn=${{ vars.AWS_GH_ROLE_ARN }}" >> $GITHUB_OUTPUT + elif [[ "${{ github.event.inputs.role_to_assume }}" == "scprod" ]]; then + echo "role_arn=${{ vars.AWS_GH_ROLE_ARN_PROD }}" >> $GITHUB_OUTPUT + elif [[ "${{ github.event.inputs.role_to_assume }}" == "mlpoc" ]]; then + echo "role_arn=${{ vars.MLPOC_BRUKER_GH_ROLE_ARN }}" >> $GITHUB_OUTPUT + else + echo "Invalid role specified" + exit 1 + fi + - name: ☁️ Authenticate To AWS + uses: aws-actions/configure-aws-credentials@v1 + with: + role-to-assume: ${{ steps.set-role-arn.outputs.role_arn }} + role-session-name: DNA-Automation-Github-Actions-Session + 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.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/open_webui/env.py b/backend/open_webui/env.py index 4b61e1a894..ada9641303 100644 --- a/backend/open_webui/env.py +++ b/backend/open_webui/env.py @@ -100,8 +100,8 @@ WEBUI_NAME = os.environ.get("WEBUI_NAME", "Open WebUI") -if WEBUI_NAME != "Open WebUI": - WEBUI_NAME += " (Open WebUI)" +# if WEBUI_NAME != "Open WebUI": +# WEBUI_NAME += " (Open WebUI)" WEBUI_URL = os.environ.get("WEBUI_URL", "http://localhost:3000") diff --git a/backend/open_webui/static/favicon.png b/backend/open_webui/static/favicon.png index 2b20747808..fa631112ae 100644 Binary files a/backend/open_webui/static/favicon.png and b/backend/open_webui/static/favicon.png differ diff --git a/backend/open_webui/static/logo.png b/backend/open_webui/static/logo.png index 519af1db62..362c2540c6 100644 Binary files a/backend/open_webui/static/logo.png and b/backend/open_webui/static/logo.png differ diff --git a/backend/open_webui/static/splash.png b/backend/open_webui/static/splash.png index 389196ca6a..87a86b7208 100644 Binary files a/backend/open_webui/static/splash.png and b/backend/open_webui/static/splash.png differ diff --git a/backend/open_webui/utils/logo.png b/backend/open_webui/utils/logo.png index 519af1db62..362c2540c6 100644 Binary files a/backend/open_webui/utils/logo.png and b/backend/open_webui/utils/logo.png differ diff --git a/backend/open_webui/utils/oauth.py b/backend/open_webui/utils/oauth.py index 17b0c4fe09..3da3bdbe29 100644 --- a/backend/open_webui/utils/oauth.py +++ b/backend/open_webui/utils/oauth.py @@ -176,7 +176,7 @@ async def handle_callback(self, provider, request, response): if not user: # If the user does not exist, check if signups are enabled - if auth_manager_config.ENABLE_OAUTH_SIGNUP.value: + if auth_manager_config.ENABLE_OAUTH_SIGNUP: # Check if an existing user with the same email already exists existing_user = Users.get_user_by_email( user_data.get("email", "").lower() 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