Commit b879f3c 1 parent 04371a1 commit b879f3c Copy full SHA for b879f3c
File tree 5 files changed +12
-9
lines changed
5 files changed +12
-9
lines changed Original file line number Diff line number Diff line change 60
60
# ## LINUX
61
61
62
62
- name : linux > build
63
- run : make TAURI_SIGNING_PRIVATE_KEY="${{ secrets.TAURI_PRIVATE_KEY }}" TAURI_SIGNING_PRIVATE_KEY_PASSWORD="${{ secrets.TAURI_KEY_PASSWORD }}" build_docker_tauri
63
+ 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
64
64
if : matrix.platform == 'ubuntu-latest'
65
65
66
66
- name : linux > upload artifacts
@@ -146,7 +146,7 @@ jobs:
146
146
- uses : actions/checkout@v4
147
147
148
148
- name : build extensions
149
- run : make build_browser_extensions
149
+ run : make DOCKER_USERID=1001 build_browser_extensions
150
150
151
151
- name : upload artifacts
152
152
uses : actions/upload-artifact@v4
Original file line number Diff line number Diff line change 1
1
# Changelog
2
2
3
- ## 1.3.0
3
+ ## 1.3.1
4
4
5
5
Change the build process for the linux desktop app. It now requires glibc ` 3.35 ` , so it should run distros using
6
6
older versions of glibc, like ` debian:bookworm ` or ` ubuntu:jammy ` .
Original file line number Diff line number Diff line change 1
1
CI ?=
2
2
TAURI_SIGNING_PRIVATE_KEY ?=
3
3
TAURI_SIGNING_PRIVATE_KEY_PASSWORD ?=
4
+ DOCKER_USERID ?= 1000
4
5
5
6
build_docker_ci :
6
7
docker build -f docker/Dockerfile_ci -t elasticvue-ci .
@@ -12,7 +13,7 @@ build_tauri:
12
13
yarn tauri:build
13
14
14
15
build_docker_tauri :
15
- docker build . -t elasticvue-linux-tauri -f docker/Dockerfile_tauri
16
+ docker build -t elasticvue-linux-tauri -f docker/Dockerfile_tauri --build-arg USERID= " $( DOCKER_USERID ) " .
16
17
docker run --rm -e TAURI_SIGNING_PRIVATE_KEY=" $( TAURI_SIGNING_PRIVATE_KEY) " \
17
18
-e TAURI_SIGNING_PRIVATE_KEY_PASSWORD=" $( TAURI_SIGNING_PRIVATE_KEY_PASSWORD) " \
18
19
-v .:/app \
@@ -29,7 +30,7 @@ build_docker_nginx_multiarch:
29
30
# Build elasticvue browser extensions into ./artifacts via docker
30
31
build_browser_extensions :
31
32
mkdir -p " $( CURDIR) /artifacts"
32
- docker build -f docker/Dockerfile_browser_ext -t elasticvue-build_browser_ext .
33
+ docker build -f docker/Dockerfile_browser_ext -t elasticvue-build_browser_ext --build-arg USERID= " $( DOCKER_USERID ) " .
33
34
docker run --rm -v " $( CURDIR) /artifacts" :/app/artifacts elasticvue-build_browser_ext scripts/build_browser_extensions.sh
34
35
35
36
run_docker_nginx :
Original file line number Diff line number Diff line change 1
1
FROM node:22.5.1-bookworm
2
+ ARG USERID=1000
2
3
3
4
RUN apt-get update -qq \
4
5
&& apt-get upgrade -y \
@@ -20,7 +21,7 @@ COPY yarn.lock .
20
21
RUN yarn install
21
22
COPY . .
22
23
23
- RUN chown -R 1000:1000 /app
24
- USER 1000
24
+ RUN chown -R $USERID:$USERID /app
25
+ USER $USERID
25
26
26
27
ENTRYPOINT ["/bin/bash"]
Original file line number Diff line number Diff line change 1
1
FROM ubuntu:jammy
2
+ ARG USERID=1000
2
3
3
4
ENV NODE_VERSION=22
4
5
ENV APP_HOME=/app
5
6
ENV BUILD_USER=tauri
6
7
7
- RUN useradd --uid 1000 -m $BUILD_USER
8
+ RUN useradd --uid $USERID -m $BUILD_USER
8
9
RUN mkdir -p $APP_HOME
9
- RUN chown -R 1000:1000 $APP_HOME
10
+ RUN chown -R $USERID:$USERID $APP_HOME
10
11
11
12
WORKDIR $APP_HOME
12
13
You can’t perform that action at this time.
0 commit comments