From de0dea7df89c0558587a654f484792df2dc11f12 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Fri, 20 Dec 2024 13:27:07 +0530 Subject: [PATCH 1/5] ci: container image for production setup --- .github/workflows/build.yml | 54 +++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..0822a545 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,54 @@ +name: Build Container Image +on: + workflow_dispatch: + push: + branches: + - main + tags: + - "*" +jobs: + build: + name: Build + runs-on: ubuntu-latest + strategy: + matrix: + arch: [amd64, arm64] + steps: + - name: Checkout Entire Repository + uses: actions/checkout@v4 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + with: + platforms: linux/${{ matrix.arch }} + - name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.RELEASE_TOKEN }} + - name: Set Branch + run: | + export APPS_JSON='[{"url": "https://github.com/frappe/lms","branch": "main"}]' + echo "APPS_JSON_BASE64=$(echo $APPS_JSON | base64 -w 0)" >> $GITHUB_ENV + echo "FRAPPE_BRANCH=version-15" >> $GITHUB_ENV + - name: Set Image Tag + run: | + echo "IMAGE_TAG=stable" >> $GITHUB_ENV + - uses: actions/checkout@v4 + with: + repository: frappe/frappe_docker + path: builds + - name: Build and push + uses: docker/build-push-action@v6 + with: + push: true + context: builds + file: builds/images/layered/Containerfile + tags: > + ghcr.io/${{ github.repository }}:${{ github.ref_name }}, + ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }} + build-args: | + "FRAPPE_BRANCH=${{ env.FRAPPE_BRANCH }}" + "APPS_JSON_BASE64=${{ env.APPS_JSON_BASE64 }}" \ No newline at end of file From b625d9b0990d53272d210c01183c000e3127d53d Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 23 Dec 2024 11:33:09 +0530 Subject: [PATCH 2/5] fix: markdown embed and paste issue --- .github/workflows/build.yml | 6 ++--- frontend/src/utils/markdownParser.js | 38 +++++++++++++++------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0822a545..275c3a09 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,9 +10,9 @@ jobs: build: name: Build runs-on: ubuntu-latest - strategy: - matrix: - arch: [amd64, arm64] + permissions: + packages: write + steps: - name: Checkout Entire Repository uses: actions/checkout@v4 diff --git a/frontend/src/utils/markdownParser.js b/frontend/src/utils/markdownParser.js index 1303d1a7..db47283c 100644 --- a/frontend/src/utils/markdownParser.js +++ b/frontend/src/utils/markdownParser.js @@ -18,6 +18,27 @@ export class Markdown { } } + onPaste(event) { + const data = { + text: event.detail.data.innerHTML, + } + + this.data = data + + window.requestAnimationFrame(() => { + if (!this.wrapper) { + return + } + this.wrapper.innerHTML = this.data.text || '' + }) + } + + static get pasteConfig() { + return { + tags: ['P'], + } + } + render() { this.wrapper = document.createElement('div') this.wrapper.classList.add('cdx-block') @@ -36,10 +57,6 @@ export class Markdown { this.parseContent(event) } }) - - this.wrapper.addEventListener('paste', (event) => - this.handlePaste(event) - ) } return this.wrapper @@ -101,19 +118,6 @@ export class Markdown { this.api.caret.focus(true) } - handlePaste(event) { - event.preventDefault() - - const clipboardData = event.clipboardData || window.clipboardData - const pastedText = clipboardData.getData('text/plain') - const sanitizedText = this.processPastedContent(pastedText) - document.execCommand('insertText', false, sanitizedText) - } - - processPastedContent(text) { - return text.trim() - } - save(blockContent) { return { text: blockContent.innerHTML, From f28f37fb2c37bfe83bf030da0c98b795ed688d04 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 23 Dec 2024 12:14:00 +0530 Subject: [PATCH 3/5] ci: added back arch for building docker image --- .github/workflows/build.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 275c3a09..63fd2e75 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,14 +10,21 @@ jobs: build: name: Build runs-on: ubuntu-latest + + strategy: + matrix: + arch: [amd64, arm64] + permissions: packages: write steps: - name: Checkout Entire Repository uses: actions/checkout@v4 + - name: Set up QEMU uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: @@ -28,11 +35,13 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.RELEASE_TOKEN }} + - name: Set Branch run: | export APPS_JSON='[{"url": "https://github.com/frappe/lms","branch": "main"}]' echo "APPS_JSON_BASE64=$(echo $APPS_JSON | base64 -w 0)" >> $GITHUB_ENV echo "FRAPPE_BRANCH=version-15" >> $GITHUB_ENV + - name: Set Image Tag run: | echo "IMAGE_TAG=stable" >> $GITHUB_ENV @@ -40,6 +49,7 @@ jobs: with: repository: frappe/frappe_docker path: builds + - name: Build and push uses: docker/build-push-action@v6 with: From d0189b0e3ad9d6de7da0e7e97be860670a83ec00 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Mon, 23 Dec 2024 12:28:31 +0530 Subject: [PATCH 4/5] ci: updated the credentials for building docker image --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 275c3a09..c492de76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: with: registry: ghcr.io username: ${{ github.actor }} - password: ${{ secrets.RELEASE_TOKEN }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Set Branch run: | export APPS_JSON='[{"url": "https://github.com/frappe/lms","branch": "main"}]' From 0fae11d0310e7058100936bf4b18e204ad15ce78 Mon Sep 17 00:00:00 2001 From: Jannat Patel <31363128+pateljannat@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:46:02 +0530 Subject: [PATCH 5/5] docs: updated self hosting steps in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6b06f476..6c0989b9 100644 --- a/README.md +++ b/README.md @@ -106,9 +106,9 @@ wget https://frappe.io/easy-install.py python3 ./easy-install.py deploy \ --project=learning_prod_setup \ --email=your_email.example.com \ - --image=ghcr.io/frappe/learning \ + --image=ghcr.io/frappe/lms \ --version=stable \ - --app=learning \ + --app=lms \ --sitename subdomain.domain.tld ```