Skip to content

Commit

Permalink
automatic merge to finish v1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
cars10 committed Jan 14, 2025
2 parents 48fb236 + b90ac51 commit aa37bb0
Show file tree
Hide file tree
Showing 11 changed files with 1,151 additions and 1,052 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
### LINUX

- name: linux > build
run: make TAURI_SIGNING_PRIVATE_KEY="${{ secrets.TAURI_PRIVATE_KEY }}" TAURI_SIGNING_PRIVATE_KEY_PASSWORD="${{ secrets.TAURI_KEY_PASSWORD }}" build_docker_tauri
run: make TAURI_SIGNING_PRIVATE_KEY="${{ secrets.TAURI_PRIVATE_KEY }}" TAURI_SIGNING_PRIVATE_KEY_PASSWORD="${{ secrets.TAURI_KEY_PASSWORD }}" DOCKER_USERID=1001 build_docker_tauri
if: matrix.platform == 'ubuntu-latest'

- name: linux > upload artifacts
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
- uses: actions/checkout@v4

- name: build extensions
run: make build_browser_extensions
run: make DOCKER_USERID=1001 build_browser_extensions

- name: upload artifacts
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -194,6 +194,7 @@ jobs:
needs:
- build_desktop
- build_docker
- build_browser_extensions
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 1.3.0
## 1.3.1

Change the build process for the linux desktop app. It now requires glibc `3.35`, so it should run distros using
older versions of glibc, like `debian:bookworm` or `ubuntu:jammy`.
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CI ?=
TAURI_SIGNING_PRIVATE_KEY ?=
TAURI_SIGNING_PRIVATE_KEY_PASSWORD ?=
DOCKER_USERID ?= 1000

build_docker_ci:
docker build -f docker/Dockerfile_ci -t elasticvue-ci .
Expand All @@ -12,7 +13,7 @@ build_tauri:
yarn tauri:build

build_docker_tauri:
docker build . -t elasticvue-linux-tauri -f docker/Dockerfile_tauri
docker build -t elasticvue-linux-tauri -f docker/Dockerfile_tauri --build-arg USERID="$(DOCKER_USERID)" .
docker run --rm -e TAURI_SIGNING_PRIVATE_KEY="$(TAURI_SIGNING_PRIVATE_KEY)" \
-e TAURI_SIGNING_PRIVATE_KEY_PASSWORD="$(TAURI_SIGNING_PRIVATE_KEY_PASSWORD)" \
-v .:/app \
Expand All @@ -29,7 +30,7 @@ build_docker_nginx_multiarch:
# Build elasticvue browser extensions into ./artifacts via docker
build_browser_extensions:
mkdir -p "$(CURDIR)/artifacts"
docker build -f docker/Dockerfile_browser_ext -t elasticvue-build_browser_ext .
docker build -f docker/Dockerfile_browser_ext -t elasticvue-build_browser_ext --build-arg USERID="$(DOCKER_USERID)" .
docker run --rm -v "$(CURDIR)/artifacts":/app/artifacts elasticvue-build_browser_ext scripts/build_browser_extensions.sh

run_docker_nginx:
Expand Down
2 changes: 1 addition & 1 deletion browser_extension/chrome/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Elasticvue",
"version": "1.3.0",
"version": "1.3.1",
"description": "Elasticsearch frontend",
"manifest_version": 3,
"icons": {
Expand Down
2 changes: 1 addition & 1 deletion browser_extension/firefox/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Elasticvue",
"version": "1.3.0",
"version": "1.3.1",
"description": "Elasticsearch frontend",
"manifest_version": 2,
"icons": {
Expand Down
5 changes: 3 additions & 2 deletions docker/Dockerfile_browser_ext
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM node:22.5.1-bookworm
ARG USERID=1000

RUN apt-get update -qq \
&& apt-get upgrade -y \
Expand All @@ -20,7 +21,7 @@ COPY yarn.lock .
RUN yarn install
COPY . .

RUN chown -R 1000:1000 /app
USER 1000
RUN chown -R $USERID:$USERID /app
USER $USERID

ENTRYPOINT ["/bin/bash"]
5 changes: 3 additions & 2 deletions docker/Dockerfile_tauri
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
FROM ubuntu:jammy
ARG USERID=1000

ENV NODE_VERSION=22
ENV APP_HOME=/app
ENV BUILD_USER=tauri

RUN useradd --uid 1000 -m $BUILD_USER
RUN useradd --uid $USERID -m $BUILD_USER
RUN mkdir -p $APP_HOME
RUN chown -R 1000:1000 $APP_HOME
RUN chown -R $USERID:$USERID $APP_HOME

WORKDIR $APP_HOME

Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "elasticvue",
"private": true,
"version": "1.3.0",
"version": "1.3.1",
"scripts": {
"dev": "vite",
"build": "vite build",
Expand All @@ -20,45 +20,45 @@
},
"dependencies": {
"@codemirror/lang-json": "^6.0.1",
"@intlify/unplugin-vue-i18n": "^6.0.0",
"@intlify/unplugin-vue-i18n": "^6.0.3",
"@lezer/common": "^1.2.3",
"@quasar/extras": "^1.16.14",
"@quasar/extras": "^1.16.15",
"@replit/codemirror-vim": "^6.2.1",
"@tauri-apps/api": "^2.1.1",
"@tauri-apps/plugin-clipboard-manager": "2.0.1",
"@tauri-apps/plugin-dialog": "^2.0.1",
"@tauri-apps/plugin-fs": "^2.0.3",
"@tauri-apps/plugin-process": "~2",
"@tauri-apps/plugin-updater": "^2.0.0",
"@tauri-apps/api": "^2.2.0",
"@tauri-apps/plugin-clipboard-manager": "2.2.0",
"@tauri-apps/plugin-dialog": "^2.2.0",
"@tauri-apps/plugin-fs": "^2.2.0",
"@tauri-apps/plugin-process": "^2.2.0",
"@tauri-apps/plugin-updater": "^2.3.1",
"codemirror": "^6.0.1",
"idb": "^8.0.0",
"idb": "^8.0.1",
"json-bigint": "^1.0.0",
"pinia": "^2.3.0",
"pinia-plugin-persistedstate": "^4.1.3",
"pinia-plugin-persistedstate": "^4.2.0",
"pretty-bytes": "^6.1.1",
"quasar": "^2.17.4",
"quasar": "^2.17.6",
"vue": "^3.5.13",
"vue-i18n": "^10.0.5",
"vue-resizable": "^2.1.7",
"vue-router": "^4.5.0"
},
"devDependencies": {
"@intlify/eslint-plugin-vue-i18n": "^3.1.0",
"@playwright/test": "^1.49.0",
"@playwright/test": "^1.49.1",
"@quasar/vite-plugin": "^1.8.1",
"@tauri-apps/cli": "^2.1.0",
"@tauri-apps/cli": "^2.2.4",
"@types/json-bigint": "^1.0.4",
"@vitejs/plugin-vue": "^5.2.1",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/tsconfig": "^0.7.0",
"cross-env": "^7.0.3",
"eslint": "^9.16.0",
"eslint": "^9.18.0",
"eslint-plugin-vue": "^9.32.0",
"sass": "^1.82.0",
"sass": "^1.83.4",
"typescript": "5.6.3",
"vite": "^6.0.2",
"vite": "^6.0.7",
"vite-bundle-visualizer": "^1.2.1",
"vitest": "^2.1.8",
"vue-tsc": "^2.1.10"
"vue-tsc": "^2.2.0"
}
}
Loading

0 comments on commit aa37bb0

Please sign in to comment.