Compare commits

..

3 commits

Author SHA1 Message Date
mrilyew
e49f927186
Merge c6f3d767fc into 4166481a75 2025-01-30 18:46:14 +03:00
celestora
4166481a75
fix(im): escape html in sent messages too (#1218)
fixes #1215
2025-01-30 00:13:20 +03:00
7fe0c6a122
ci(actions): unparallel builds (#1217)
this should fix linux/amd64 showing up as unknown/unknown on ghcr
2025-01-28 20:41:26 +03:00
2 changed files with 123 additions and 125 deletions

View file

@ -6,14 +6,11 @@ env:
BASE_IMAGE_NAME: openvk BASE_IMAGE_NAME: openvk
DB_IMAGE_NAME: mariadb DB_IMAGE_NAME: mariadb
EVENT_IMAGE_NAME: mariadb EVENT_IMAGE_NAME: mariadb
DB_VERSION: "10.9" DB_VERSION: '10.9'
jobs: jobs:
buildbase: buildbase:
name: Build base images name: Build base images
strategy:
matrix:
platform: [amd64, arm64]
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -24,6 +21,8 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
id: buildx id: buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
with:
platforms: linux/amd64,linux/arm64
- name: Change repository string to lowercase - name: Change repository string to lowercase
id: repositorystring id: repositorystring
@ -53,7 +52,7 @@ jobs:
- name: Build base image - name: Build base image
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
platforms: linux/${{matrix.platform}} platforms: linux/amd64,linux/arm64
file: install/automated/docker/openvk.Dockerfile file: install/automated/docker/openvk.Dockerfile
tags: ${{ steps.basemeta.outputs.tags }} tags: ${{ steps.basemeta.outputs.tags }}
labels: ${{ steps.basemeta.outputs.labels }} labels: ${{ steps.basemeta.outputs.labels }}
@ -63,9 +62,6 @@ jobs:
builddb: builddb:
name: Build DB images name: Build DB images
strategy:
matrix:
platform: [amd64, arm64]
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -76,6 +72,8 @@ jobs:
- name: Set up Docker Buildx - name: Set up Docker Buildx
id: buildx id: buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3
with:
platforms: linux/amd64,linux/arm64
- name: Change repository string to lowercase - name: Change repository string to lowercase
id: repositorystring id: repositorystring
@ -125,7 +123,7 @@ jobs:
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
platforms: linux/${{matrix.platform}} platforms: linux/amd64,linux/arm64
file: install/automated/docker/mariadb-primary.Dockerfile file: install/automated/docker/mariadb-primary.Dockerfile
tags: ${{ steps.db-primarymeta.outputs.tags }} tags: ${{ steps.db-primarymeta.outputs.tags }}
labels: ${{ steps.db-primarymeta.outputs.labels }} labels: ${{ steps.db-primarymeta.outputs.labels }}
@ -136,7 +134,7 @@ jobs:
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
platforms: linux/${{matrix.platform}} platforms: linux/amd64,linux/arm64
file: install/automated/docker/mariadb-eventdb.Dockerfile file: install/automated/docker/mariadb-eventdb.Dockerfile
tags: ${{ steps.db-eventmeta.outputs.tags }} tags: ${{ steps.db-eventmeta.outputs.tags }}
labels: ${{ steps.db-eventmeta.outputs.labels }} labels: ${{ steps.db-eventmeta.outputs.labels }}

View file

@ -232,7 +232,7 @@
sendMessage(content) { sendMessage(content) {
console.debug("New outcoming message. Pushing preview to local stack."); console.debug("New outcoming message. Pushing preview to local stack.");
let tempId = this.newMessage(content); let tempId = this.newMessage(escapeHtml(content));
let msgData = new FormData(); let msgData = new FormData();
msgData.set("content", content); msgData.set("content", content);