⬆️ Upgrade devenv (ubuntu, jvm, node)

2025-05-11 03:26:37 +02:00 · 2025-04-07 16:23:32 +02:00 · 2025-04-07 16:23:32 +02:00 · a4701866a4
commit a4701866a4
parent 79679cbb16
7 changed files with 36 additions and 33 deletions
--- a/backend/scripts/repl
+++ b/backend/scripts/repl
@ -70,7 +70,7 @@ export PENPOT_OBJECTS_STORAGE_S3_ENDPOINT=http://minio:9000
 export PENPOT_OBJECTS_STORAGE_S3_BUCKET=penpot
 export PENPOT_OBJECTS_STORAGE_FS_DIRECTORY="assets"

-export JAVA_OPTS="--enable-preview \
+export JAVA_OPTS="\
       -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager \
       -Djdk.attach.allowAttachSelf \
       -Dlog4j2.configurationFile=log4j2-devenv-repl.xml \
@ -78,7 +78,10 @@ export JAVA_OPTS="--enable-preview \
       -XX:+EnableDynamicAgentLoading \
       -XX:-OmitStackTraceInFastThrow                    \
       -XX:+UnlockDiagnosticVMOptions \
-       -XX:+DebugNonSafepoints";
+       -XX:+DebugNonSafepoints \
+       --sun-misc-unsafe-memory-access=allow \
+       --enable-preview \
+       --enable-native-access=ALL-UNNAMED";

 export OPTIONS="-A:jmx-remote -A:dev"

--- a/backend/scripts/run.template.sh
+++ b/backend/scripts/run.template.sh
@ -18,7 +18,7 @@ if [ -f ./environ ]; then
    source ./environ
 fi

-export JVM_OPTS="-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager -Dlog4j2.configurationFile=log4j2.xml -XX:-OmitStackTraceInFastThrow --enable-preview $JVM_OPTS"
+export JVM_OPTS="-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager -Dlog4j2.configurationFile=log4j2.xml -XX:-OmitStackTraceInFastThrow --enable-native-access=ALL-UNNAMED --enable-preview $JVM_OPTS"

 ENTRYPOINT=${1:-app.main};

--- a/backend/scripts/start-dev
+++ b/backend/scripts/start-dev
@ -25,17 +25,6 @@ export PENPOT_FLAGS="\
       enable-file-validation \
       enable-file-schema-validation";

-export OPTIONS="
-       -A:jmx-remote -A:dev \
-       -J-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager \
-       -J-Djdk.attach.allowAttachSelf \
-       -J-Dpolyglot.engine.WarnInterpreterOnly=false \
-       -J-Dlog4j2.configurationFile=log4j2-devenv.xml \
-       -J-XX:+EnableDynamicAgentLoading \
-       -J-XX:-OmitStackTraceInFastThrow \
-       -J-XX:+UnlockDiagnosticVMOptions \
-       -J-XX:+DebugNonSafepoints"
-
 # Default deletion delay for devenv
 export PENPOT_DELETION_DELAY="24h"

@ -65,6 +54,20 @@ export PENPOT_OBJECTS_STORAGE_S3_BUCKET=penpot

 entrypoint=${1:-app.main};

-set -ex
+export JAVA_OPTS="\
+       -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager \
+       -Djdk.attach.allowAttachSelf \
+       -Dlog4j2.configurationFile=log4j2-devenv.xml \
+       -Djdk.tracePinnedThreads=full \
+       -XX:+EnableDynamicAgentLoading \
+       -XX:-OmitStackTraceInFastThrow                    \
+       -XX:+UnlockDiagnosticVMOptions \
+       -XX:+DebugNonSafepoints \
+       --sun-misc-unsafe-memory-access=allow \
+       --enable-preview \
+       --enable-native-access=ALL-UNNAMED";

-clojure $OPTIONS -A:dev -M -m $entrypoint;
+export OPTIONS="-A:jmx-remote -A:dev"
+
+set -ex
+clojure $OPTIONS -M -m $entrypoint;
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@ -1,9 +1,9 @@
-FROM debian:bookworm
+FROM ubuntu:24.04
 LABEL maintainer="Penpot <docker@penpot.app>"

 ARG DEBIAN_FRONTEND=noninteractive

-ENV NODE_VERSION=v22.13.1 \
+ENV NODE_VERSION=v22.14.0 \
    CLOJURE_VERSION=1.12.0.1501 \
    CLJKONDO_VERSION=2025.01.16 \
    BABASHKA_VERSION=1.12.196 \
@ -45,7 +45,7 @@ RUN set -ex; \
    rm -rf /var/lib/apt/lists/*;

 RUN set -ex; \
-    useradd -m -g users -s /bin/bash penpot; \
+    usermod -l penpot -d /home/penpot -G users -s /bin/bash ubuntu; \
    passwd penpot -d; \
    echo "penpot ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers

@ -63,8 +63,6 @@ RUN set -ex; \
        woff-tools \
        woff2 \
        fontforge \
-        gconf-service \
-        libasound2 \
        libatk1.0-0 \
        libatk-bridge2.0-0 \
        libcairo2 \
@ -73,7 +71,6 @@ RUN set -ex; \
        libexpat1 \
        libfontconfig1 \
        libgcc1 \
-        libgconf-2-4 \
        libgdk-pixbuf2.0-0 \
        libglib2.0-0 \
        libgtk-3-0 \
@ -95,7 +92,6 @@ RUN set -ex; \
        libxss1 \
        libxtst6 \
        fonts-liberation \
-        libappindicator1 \
        libnss3 \
        libgbm1 \
        xvfb \
@ -107,12 +103,12 @@ RUN set -eux; \
    ARCH="$(dpkg --print-architecture)"; \
    case "${ARCH}" in \
       aarch64|arm64) \
-         ESUM='fb43ae1202402842559cb6223886ec1663b90ffbec48479abbcb92c92c9012eb'; \
-         BINARY_URL='https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.2_7.tar.gz'; \
+         ESUM='18071047526ab4b53131f9bb323e8703485ae37fcb2f2c5ef0f1b7bab66d1b94'; \
+         BINARY_URL='https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_aarch64_linux_hotspot_24_36.tar.gz'; \
         ;; \
       amd64|x86_64) \
-         ESUM='870ac8c05c6fe563e7a3878a47d0234b83c050e83651d2c47e8b822ec74512dd'; \
-         BINARY_URL='https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_linux_hotspot_23.0.2_7.tar.gz'; \
+         ESUM='c340dee97b6aa215d248bc196dcac5b56e7be9b5c5d45e691344d40d5d0b171d'; \
+         BINARY_URL='https://github.com/adoptium/temurin24-binaries/releases/download/jdk-24%2B36/OpenJDK24U-jdk_x64_linux_hotspot_24_36.tar.gz'; \
         ;; \
       *) \
         echo "Unsupported arch: ${ARCH}"; \
@ -137,7 +133,7 @@ RUN set -ex; \
 RUN set -ex; \
    install -d /usr/share/postgresql-common/pgdg; \
    curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc; \
-    echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list; \
+    echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt noble-pgdg main" >> /etc/apt/sources.list.d/postgresql.list; \
    apt-get -qq update; \
    apt-get -qqy install postgresql-client-16; \
    rm -rf /var/lib/apt/lists/*;
--- a/docker/devenv/docker-compose.yaml
+++ b/docker/devenv/docker-compose.yaml
@ -68,7 +68,7 @@ services:
      - PENPOT_LDAP_ATTRS_PHOTO=jpegPhoto

  minio:
-    image: "minio/minio:RELEASE.2023-11-11T08-14-41Z"
+    image: "minio/minio:RELEASE.2025-04-03T14-56-28Z"
    command: minio server /mnt/data --console-address ":9001"

    volumes:
@ -83,7 +83,7 @@ services:
      - 9001:9001

  postgres:
-    image: postgres:16
+    image: postgres:16.8
    command: postgres -c config_file=/etc/postgresql.conf
    restart: always
    stop_signal: SIGINT
--- a/docker/devenv/files/entrypoint.sh
+++ b/docker/devenv/files/entrypoint.sh
@ -1,6 +1,6 @@
 #!/usr/bin/env bash

 set -e
-usermod -u ${EXTERNAL_UID:-1000} penpot
+# usermod -u ${EXTERNAL_UID:-1000} penpot

 exec "$@"
--- a/frontend/deps.edn
+++ b/frontend/deps.edn
@ -49,6 +49,7 @@
    cider/cider-nrepl {:mvn/version "0.48.0"}}}

  :shadow-cljs
-  {:main-opts ["-m" "shadow.cljs.devtools.cli"]}
+  {:jvm-opts ["--sun-misc-unsafe-memory-access=allow"]
+   :main-opts ["-m" "shadow.cljs.devtools.cli"]}

  }}