diff --git a/CHANGELOG.md b/CHANGELOG.md index f4884fba..49970bb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,8 @@ ## 1.3.0 -Change the build process for the linux desktop app. It now requires glibc `3.36`, so it should run distros using -outdated versions of glibc, like `debian:bookworm`. +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`. ## 1.2.0 diff --git a/Makefile b/Makefile index 15879301..4c5d5403 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ build_docker_tauri: 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 \ - elasticvue-linux-tauri bash -c "yarn && . ~/.cargo/env && yarn tauri:build" + elasticvue-linux-tauri bash -c "yarn && . ~/.cargo/env && rm -rf src-tauri/target && yarn tauri:build" # Build docker image to run elasticvue served by nginx build_docker_nginx: diff --git a/docker/Dockerfile_tauri b/docker/Dockerfile_tauri index dbfd3ee6..411d92ee 100644 --- a/docker/Dockerfile_tauri +++ b/docker/Dockerfile_tauri @@ -1,4 +1,4 @@ -FROM debian:bookworm +FROM ubuntu:jammy ENV NODE_VERSION=22 ENV APP_HOME=/app @@ -45,20 +45,20 @@ RUN mkdir -p /tmp/ubuntu-packages \ && wget https://launchpadlibrarian.net/723972735/gir1.2-javascriptcoregtk-4.1_2.44.0-0ubuntu0.22.04.1_amd64.deb \ && wget https://launchpadlibrarian.net/723972739/gir1.2-webkit2-4.1_2.44.0-0ubuntu0.22.04.1_amd64.deb \ && wget https://launchpadlibrarian.net/606433947/libicu70_70.1-2ubuntu1_amd64.deb \ + && wget https://launchpadlibrarian.net/606433941/libicu-dev_70.1-2ubuntu1_amd64.deb \ + && wget https://launchpadlibrarian.net/606433945/icu-devtools_70.1-2ubuntu1_amd64.deb \ && wget https://launchpadlibrarian.net/595623693/libjpeg8_8c-2ubuntu10_amd64.deb \ && wget https://launchpadlibrarian.net/587202140/libjpeg-turbo8_2.1.2-0ubuntu1_amd64.deb \ && wget https://launchpadlibrarian.net/592959859/xdg-desktop-portal-gtk_1.14.0-1build1_amd64.deb -RUN apt-get update && \ - apt-get install -y build-essential \ - curl \ - wget \ - file \ - libssl-dev \ - libgtk-3-dev \ - libxdo-dev \ - libayatana-appindicator3-dev \ - librsvg2-dev \ +RUN apt-get update \ + && apt-get install -y build-essential \ + file \ + libssl-dev \ + libgtk-3-dev \ + libxdo-dev \ + libayatana-appindicator3-dev \ + librsvg2-dev \ && apt-get install -y /tmp/ubuntu-packages/*.deb \ && rm -rf /tmp/ubuntu-packages \ && apt-get clean \