Skip to content

Commit b879f3c

Browse files
committed
try to fix build issues #1
1 parent 04371a1 commit b879f3c

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
### LINUX
6161

6262
- 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
6464
if: matrix.platform == 'ubuntu-latest'
6565

6666
- name: linux > upload artifacts
@@ -146,7 +146,7 @@ jobs:
146146
- uses: actions/checkout@v4
147147

148148
- name: build extensions
149-
run: make build_browser_extensions
149+
run: make DOCKER_USERID=1001 build_browser_extensions
150150

151151
- name: upload artifacts
152152
uses: actions/upload-artifact@v4

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## 1.3.0
3+
## 1.3.1
44

55
Change the build process for the linux desktop app. It now requires glibc `3.35`, so it should run distros using
66
older versions of glibc, like `debian:bookworm` or `ubuntu:jammy`.

Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
CI ?=
22
TAURI_SIGNING_PRIVATE_KEY ?=
33
TAURI_SIGNING_PRIVATE_KEY_PASSWORD ?=
4+
DOCKER_USERID ?= 1000
45

56
build_docker_ci:
67
docker build -f docker/Dockerfile_ci -t elasticvue-ci .
@@ -12,7 +13,7 @@ build_tauri:
1213
yarn tauri:build
1314

1415
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)" .
1617
docker run --rm -e TAURI_SIGNING_PRIVATE_KEY="$(TAURI_SIGNING_PRIVATE_KEY)" \
1718
-e TAURI_SIGNING_PRIVATE_KEY_PASSWORD="$(TAURI_SIGNING_PRIVATE_KEY_PASSWORD)" \
1819
-v .:/app \
@@ -29,7 +30,7 @@ build_docker_nginx_multiarch:
2930
# Build elasticvue browser extensions into ./artifacts via docker
3031
build_browser_extensions:
3132
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)" .
3334
docker run --rm -v "$(CURDIR)/artifacts":/app/artifacts elasticvue-build_browser_ext scripts/build_browser_extensions.sh
3435

3536
run_docker_nginx:

docker/Dockerfile_browser_ext

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM node:22.5.1-bookworm
2+
ARG USERID=1000
23

34
RUN apt-get update -qq \
45
&& apt-get upgrade -y \
@@ -20,7 +21,7 @@ COPY yarn.lock .
2021
RUN yarn install
2122
COPY . .
2223

23-
RUN chown -R 1000:1000 /app
24-
USER 1000
24+
RUN chown -R $USERID:$USERID /app
25+
USER $USERID
2526

2627
ENTRYPOINT ["/bin/bash"]

docker/Dockerfile_tauri

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
FROM ubuntu:jammy
2+
ARG USERID=1000
23

34
ENV NODE_VERSION=22
45
ENV APP_HOME=/app
56
ENV BUILD_USER=tauri
67

7-
RUN useradd --uid 1000 -m $BUILD_USER
8+
RUN useradd --uid $USERID -m $BUILD_USER
89
RUN mkdir -p $APP_HOME
9-
RUN chown -R 1000:1000 $APP_HOME
10+
RUN chown -R $USERID:$USERID $APP_HOME
1011

1112
WORKDIR $APP_HOME
1213

0 commit comments

Comments
 (0)