From aa12e5208136804cbf8f80870bd4f36c69bee438 Mon Sep 17 00:00:00 2001
From: Andrey Antukh ` against the downloaded JDK before bumping. Source of the URL and both sums: the Azul metadata API (`api.azul.com/metadata/v1/zulu/packages/?java_version=
-
-
-
diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile
index 73294cb15d..6cd9b8cdfe 100644
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -1,4 +1,4 @@
-FROM dhi.io/debian-base:trixie-debian13-dev@sha256:9b025768946856e44f9775005eb199f2e1820484ea27bb5c8bcbb187b80464dc AS base
+FROM dhi.io/debian-base:trixie-debian13-dev@sha256:f90fd43cdf3dd94840b4dc3a2a39fd2a08578e40e7895535e2e20a1275ba6013 AS base
ENV LANG='C.UTF-8' \
LC_ALL='C.UTF-8' \
@@ -66,8 +66,8 @@ RUN set -ex; \
FROM base AS setup-node
-ENV NODE_VERSION=v24.22.2 \
- PNPM_VERSION=12.16.1 \
+ENV NODE_VERSION=v24.22.3 \
+ PNPM_VERSION=12.21.0 \
PATH=/opt/node/bin:$PATH
RUN set -eux; \
@@ -76,16 +76,16 @@ RUN set -eux; \
aarch64|arm64) \
OPENSSL_ARCH='linux-aarch64'; \
BINARY_URL="https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-arm64.tar.gz"; \
- NODE_SHA256='95c264150aceb7f3437a29fd6984924f5f8d1511ea3cbd6c508b83f6c555dae2'; \
+ NODE_SHA256='261af2af250dfd7e9f25cf151d1b2713a0adf8f10a9ad116c4947f68627affe8'; \
PNPM_ARCH='arm64'; \
- PNPM_SHA256='f5847699e5d528f8f8e9bcfb385e58cb9fba7482af1b1aa7b70737be42277f81'; \
+ PNPM_SHA256='6c5913a48c93b3a556b71c3bd9bf12c6bf9fbfbbbd2dcbd1d52a85c539751b9e'; \
;; \
amd64|x86_64) \
OPENSSL_ARCH='linux-x86_64'; \
BINARY_URL="https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-linux-x64.tar.gz"; \
- NODE_SHA256='361718c444e49af2ca5a110c83ba6a8901143f23ab285ebbef0341f391f482a9'; \
+ NODE_SHA256='061ec3e3062115705b56b51fa9cc330ab50d34b6969387d4e4b1a50c6809acc2'; \
PNPM_ARCH='x64'; \
- PNPM_SHA256='565ff81174a14f6f7bd5d84c1b17e51031a80230d370a1fe24be5d16bd02a825'; \
+ PNPM_SHA256='84c4773bcf4a217f4083cd7b2a91e4cee6103cf42426c1282ef37d308f55a410'; \
;; \
*) \
echo "Unsupported arch: ${ARCH}"; \
@@ -150,12 +150,12 @@ RUN set -eux; \
ARCH="$(dpkg --print-architecture)"; \
case "${ARCH}" in \
aarch64|arm64) \
- ESUM='9fa5bf865783c43840101fcdc3a5222b60daf4fe11f26806247bf807c08aba38'; \
- BINARY_URL='https://cdn.azul.com/zulu/bin/zulu27.28.101-ca-jdk27.0.0-linux_aarch64.tar.gz'; \
+ ESUM='18875b92ad2535230a13175f718933f7cc0593b4affa2dab442815ec245dacbb'; \
+ BINARY_URL='https://cdn.azul.com/zulu/bin/zulu27.30.201-ca-jdk27.0.1.1-linux_aarch64.tar.gz'; \
;; \
amd64|x86_64) \
- ESUM='ccbc15c4edbedfdcc03c2d29a2aa2c6daf9e6ffb4cda7dd5ece0fcbb37350267'; \
- BINARY_URL='https://cdn.azul.com/zulu/bin/zulu27.28.101-ca-jdk27.0.0-linux_x64.tar.gz'; \
+ ESUM='c4d7bf4c80a21e935187ecdcb111e4b2f14e1fdd18364974fe7f7da54b12bea0'; \
+ BINARY_URL='https://cdn.azul.com/zulu/bin/zulu27.30.201-ca-jdk27.0.1.1-linux_x64.tar.gz'; \
;; \
*) \
echo "Unsupported arch: ${ARCH}"; \
@@ -187,7 +187,7 @@ ENV PATH=/opt/cargo/bin:$PATH \
RUSTUP_HOME=/opt/rustup \
CARGO_HOME=/opt/cargo \
RUSTUP_VERSION=1.28.2 \
- RUST_VERSION=1.91.0 \
+ RUST_VERSION=1.99.0 \
EMSCRIPTEN_VERSION=4.0.6
WORKDIR /opt
@@ -236,7 +236,9 @@ ENV CLJKONDO_VERSION=2026.10.20 \
UV_TOOL_DIR=/opt/uv/tools \
UV_TOOL_BIN_DIR=/opt/utils/bin \
UV_PYTHON_INSTALL_DIR=/opt/uv/python \
- SERENA_VERSION=1.7.0
+ SERENA_VERSION=2.1.0
+# NOTE: When updating SERENA_VERSION, also update SERENA_UPDATE_VERSION in docker-compose.main.yml.
+# The latter results in a dynamic update without rebuilding the image, so it must never be lower than SERENA_VERSION here.
RUN set -ex; \
ARCH="$(dpkg --print-architecture)"; \
@@ -429,6 +431,8 @@ RUN set -ex; \
fontforge \
\
xvfb \
+ xauth \
+ libvulkan1 \
fonts-noto-color-emoji \
fonts-unifont \
libfontconfig1 \
diff --git a/docker/devenv/docker-compose.gpu.yml b/docker/devenv/docker-compose.gpu.yml
new file mode 100644
index 0000000000..99c21037b0
--- /dev/null
+++ b/docker/devenv/docker-compose.gpu.yml
@@ -0,0 +1,14 @@
+services:
+ main:
+ environment:
+ - NVIDIA_DRIVER_CAPABILITIES=all
+ - PENPOT_GPU=1
+ deploy:
+ resources:
+ reservations:
+ devices:
+ - driver: nvidia
+ count: all
+ capabilities: [gpu]
+ volumes:
+ - /usr/share/vulkan/icd.d:/usr/share/vulkan/icd.d:ro
diff --git a/docker/devenv/docker-compose.main.yml b/docker/devenv/docker-compose.main.yml
index 219e348a56..6836861354 100644
--- a/docker/devenv/docker-compose.main.yml
+++ b/docker/devenv/docker-compose.main.yml
@@ -98,8 +98,14 @@ services:
# Agentic devenv: set to a PyPI release version/tag to update Serena on startup,
# leave empty to skip update and use the version baked into the image.
- - SERENA_UPDATE_VERSION=
+ - SERENA_UPDATE_VERSION=2.1.0
- SHADOW_SERVER_URL=${SHADOW_SERVER_URL}
+ # Frontend dev devenv switch: makes the frontend compile with
+ # PENPOT_DEVENV=true so the admin-console is disabled by default
+ # (app.config/devenv-mode). `enable-admin-console` in config.js
+ # re-enables it.
+ - PENPOT_DEVENV=true
+
networks:
- default
diff --git a/docker/devenv/files/nginx.conf b/docker/devenv/files/nginx.conf
index 5a0a81f091..9a3cfd3222 100644
--- a/docker/devenv/files/nginx.conf
+++ b/docker/devenv/files/nginx.conf
@@ -141,6 +141,11 @@ http {
proxy_pass http://127.0.0.1:6061;
}
+ location = /.well-known/oauth-authorization-server/api/mcp/oauth {
+ proxy_pass http://127.0.0.1:6060;
+ proxy_http_version 1.1;
+ }
+
location /api {
proxy_pass http://127.0.0.1:6060/api;
proxy_http_version 1.1;
diff --git a/docker/devenv/files/tmux.conf b/docker/devenv/files/tmux.conf
index 062c1622c7..349aa43fc7 100644
--- a/docker/devenv/files/tmux.conf
+++ b/docker/devenv/files/tmux.conf
@@ -6,5 +6,8 @@ set -g mouse off
set -g history-limit 50000
setw -g mode-keys emacs
+set -g set-clipboard on
+set -g allow-passthrough on
+
bind-key -r C-n resize-pane -U
bind-key -r C-m resize-pane -D
diff --git a/docker/gitpod/Dockerfile b/docker/gitpod/Dockerfile
deleted file mode 100644
index 30ec7da8fe..0000000000
--- a/docker/gitpod/Dockerfile
+++ /dev/null
@@ -1,122 +0,0 @@
-FROM gitpod/workspace-postgres
-
-# Install custom tools, runtimes, etc.
-# For example "bastet", a command-line tetris clone:
-# RUN brew install bastet
-#
-# More information: https://www.gitpod.io/docs/config-docker/
-
-RUN set -ex; \
- brew install redis; \
- brew install imagemagick; \
- brew install ghostscript; \
- brew install mailhog; \
- brew install openldap; \
- brew install poppler; \
- sudo mkdir -p /var/log/nginx; \
- sudo chown gitpod:gitpod /var/log/nginx
-
-COPY files/nginx.conf /etc/nginx/nginx.conf
-COPY files/nginx-mime.types /etc/nginx/mime.types
-
-USER root
-
-ENV NODE_VERSION=v16.17.0 \
- CLOJURE_VERSION=1.11.1.1165 \
- CLJKONDO_VERSION=2022.09.08 \
- BABASHKA_VERSION=0.9.162 \
- LANG=en_US.UTF-8 \
- LC_ALL=en_US.UTF-8
-
-RUN set -ex; \
- useradd -m -g users -s /bin/bash penpot; \
- passwd penpot -d; \
- echo "penpot ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-
-RUN set -ex; \
- apt-get -qq update; \
- apt-get -qqy install \
- gconf-service \
- libasound2 \
- libatk1.0-0 \
- libatk-bridge2.0-0 \
- libcairo2 \
- libcups2 \
- libdbus-1-3 \
- libexpat1 \
- libfontconfig1 \
- libgcc1 \
- libgconf-2-4 \
- libgdk-pixbuf2.0-0 \
- libglib2.0-0 \
- libgtk-3-0 \
- libnspr4 \
- libpango-1.0-0 \
- libpangocairo-1.0-0 \
- libx11-6 \
- libx11-xcb1 \
- libxcb1 \
- libxcomposite1 \
- libxcursor1 \
- libxdamage1 \
- libxext6 \
- libxfixes3 \
- libxi6 \
- libxrandr2 \
- libxrender1 \
- libxshmfence1 \
- libxss1 \
- libxtst6 \
- fonts-liberation \
- libappindicator1 \
- libnss3 \
- libgbm1 \
- ; \
- rm -rf /var/lib/apt/lists/*;
-
-RUN set -ex; \
- curl -LfsSo /tmp/openjdk.tar.gz https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz; \
- mkdir -p /usr/lib/jvm/openjdk16; \
- cd /usr/lib/jvm/openjdk16; \
- tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
- rm -rf /tmp/openjdk.tar.gz;
-
-# Install clojure cli
-RUN set -ex; \
- curl -LfsSo /tmp/clojure.sh https://download.clojure.org/install/linux-install-$CLOJURE_VERSION.sh; \
- chmod +x /tmp/clojure.sh; \
- /tmp/clojure.sh; \
- rm -rf /tmp/clojure.sh;
-
-# Install clj-kondo
-RUN set -ex; \
- curl -LfsSo /tmp/clj-kondo.zip https://github.com/borkdude/clj-kondo/releases/download/v$CLJKONDO_VERSION/clj-kondo-$CLJKONDO_VERSION-linux-amd64.zip; \
- cd /usr/local/bin; \
- unzip /tmp/clj-kondo.zip; \
- rm /tmp/clj-kondo.zip;
-
-# Install babashka
-RUN set -ex; \
- cd /tmp; \
- curl -LfsSo /tmp/babashka.tar.gz https://github.com/babashka/babashka/releases/download/v$BABASHKA_VERSION/babashka-$BABASHKA_VERSION-linux-amd64.tar.gz; \
- cd /usr/local/bin; \
- tar -xf /tmp/babashka.tar.gz; \
- rm -rf /tmp/babashka.tar.gz;
-
-USER gitpod
-
-ENV PATH="/usr/lib/jvm/openjdk16/bin:/usr/local/nodejs/bin:$PATH" \
- JAVA_HOME=/usr/lib/jvm/openjdk16 \
- PENPOT_SMTP_ENABLED=true \
- PENPOT_SMTP_HOST=localhost \
- PENPOT_SMTP_PORT=1025 \
- PENPOT_SMTP_USER= \
- PENPOT_SMTP_PASSWORD= \
- PENPOT_SMTP_SSL=false \
- PENPOT_SMTP_TLS=false \
- PENPOT_SMTP_DEFAULT_REPLY_TO=no-reply@example.com \
- PENPOT_SMTP_DEFAULT_FROM=no-reply@example.com \
- PENPOT_DATABASE_URI="postgresql://localhost/penpot" \
- PENPOT_REDIS_URI="redis://localhost/0"
-
-# TODO Retrieve OpenLDAP from rroemhild/docker-test-openldap
diff --git a/docker/gitpod/files/nginx-mime.types b/docker/gitpod/files/nginx-mime.types
deleted file mode 100644
index 91f6aba0ac..0000000000
--- a/docker/gitpod/files/nginx-mime.types
+++ /dev/null
@@ -1,100 +0,0 @@
-
-types {
- text/html html htm shtml;
- text/css css;
- text/xml xml;
- image/gif gif;
- image/jpeg jpeg jpg;
- application/javascript js;
- application/javascript mjs;
- application/atom+xml atom;
- application/rss+xml rss;
-
- text/mathml mml;
- text/plain txt;
- text/vnd.sun.j2me.app-descriptor jad;
- text/vnd.wap.wml wml;
- text/x-component htc;
-
- image/avif avif;
- image/png png;
- image/svg+xml svg svgz;
- image/tiff tif tiff;
- image/vnd.wap.wbmp wbmp;
- image/webp webp;
- image/x-icon ico;
- image/x-jng jng;
- image/x-ms-bmp bmp;
-
- font/woff woff;
- font/woff2 woff2;
-
- application/java-archive jar war ear;
- application/json json;
- application/mac-binhex40 hqx;
- application/msword doc;
- application/pdf pdf;
- application/postscript ps eps ai;
- application/rtf rtf;
- application/vnd.apple.mpegurl m3u8;
- application/vnd.google-earth.kml+xml kml;
- application/vnd.google-earth.kmz kmz;
- application/vnd.ms-excel xls;
- application/vnd.ms-fontobject eot;
- application/vnd.ms-powerpoint ppt;
- application/vnd.oasis.opendocument.graphics odg;
- application/vnd.oasis.opendocument.presentation odp;
- application/vnd.oasis.opendocument.spreadsheet ods;
- application/vnd.oasis.opendocument.text odt;
- application/vnd.openxmlformats-officedocument.presentationml.presentation
- pptx;
- application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
- xlsx;
- application/vnd.openxmlformats-officedocument.wordprocessingml.document
- docx;
- application/vnd.wap.wmlc wmlc;
- application/wasm wasm;
- application/x-7z-compressed 7z;
- application/x-cocoa cco;
- application/x-java-archive-diff jardiff;
- application/x-java-jnlp-file jnlp;
- application/x-makeself run;
- application/x-perl pl pm;
- application/x-pilot prc pdb;
- application/x-rar-compressed rar;
- application/x-redhat-package-manager rpm;
- application/x-sea sea;
- application/x-shockwave-flash swf;
- application/x-stuffit sit;
- application/x-tcl tcl tk;
- application/x-x509-ca-cert der pem crt;
- application/x-xpinstall xpi;
- application/xhtml+xml xhtml;
- application/xspf+xml xspf;
- application/zip zip;
-
- application/octet-stream bin exe dll;
- application/octet-stream deb;
- application/octet-stream dmg;
- application/octet-stream iso img;
- application/octet-stream msi msp msm;
-
- audio/midi mid midi kar;
- audio/mpeg mp3;
- audio/ogg ogg;
- audio/x-m4a m4a;
- audio/x-realaudio ra;
-
- video/3gpp 3gpp 3gp;
- video/mp2t ts;
- video/mp4 mp4;
- video/mpeg mpeg mpg;
- video/quicktime mov;
- video/webm webm;
- video/x-flv flv;
- video/x-m4v m4v;
- video/x-mng mng;
- video/x-ms-asf asx asf;
- video/x-ms-wmv wmv;
- video/x-msvideo avi;
-}
diff --git a/docker/gitpod/files/nginx.conf b/docker/gitpod/files/nginx.conf
deleted file mode 100644
index ca403adfd2..0000000000
--- a/docker/gitpod/files/nginx.conf
+++ /dev/null
@@ -1,145 +0,0 @@
-# This Nginx config file is optional.
-# If you don't have this file, the Nginx config from the workspace-full docker image will be taken.
-
-worker_processes auto;
-pid /var/run/nginx/nginx.pid;
-include /etc/nginx/modules-enabled/*.conf;
-
-env GITPOD_REPO_ROOT;
-
-events {
- worker_connections 768;
- # multi_accept on;
-}
-
-http {
- sendfile on;
- tcp_nopush on;
- tcp_nodelay on;
- keepalive_timeout 65;
- types_hash_max_size 2048;
- # server_tokens off;
-
- # server_names_hash_bucket_size 64;
- # server_name_in_redirect off;
-
- include /etc/nginx/mime.types;
- default_type application/octet-stream;
-
- access_log /var/log/nginx/access.log;
- error_log /var/log/nginx/error.log;
-
- gzip on;
-
- gzip_vary on;
- gzip_proxied any;
- gzip_comp_level 3;
- gzip_buffers 16 8k;
- gzip_http_version 1.1;
-
- gzip_types text/plain text/css text/javascript application/javascript application/json application/transit+json;
-
- map $http_upgrade $connection_upgrade {
- default upgrade;
- '' close;
- }
-
- # include /etc/nginx/sites-enabled/*;
-
- server {
- set_by_lua $gitpod_repo_root 'return os.getenv("GITPOD_REPO_ROOT")';
-
- listen 0.0.0.0:3449 default_server;
- server_name _;
-
- client_max_body_size 5M;
- charset utf-8;
-
- proxy_http_version 1.1;
- proxy_set_header Host $http_host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Scheme $scheme;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
- resolver 8.8.8.8;
-
- etag off;
-
- root $gitpod_repo_root/frontend/resources/public;
-
- location @handle_redirect {
- set $redirect_uri "$upstream_http_location";
- set $redirect_host "$upstream_http_x_host";
- set $redirect_cache_control "$upstream_http_cache_control";
-
- proxy_buffering off;
-
- proxy_set_header Host "$redirect_host";
- proxy_hide_header etag;
- proxy_hide_header x-amz-id-2;
- proxy_hide_header x-amz-request-id;
- proxy_hide_header x-amz-meta-server-side-encryption;
- proxy_hide_header x-amz-server-side-encryption;
- proxy_pass $redirect_uri;
-
- add_header x-internal-redirect "$redirect_uri";
- add_header x-cache-control "$redirect_cache_control";
- add_header cache-control "$redirect_cache_control";
- }
-
- location /assets {
- proxy_pass http://127.0.0.1:6060/assets;
- recursive_error_pages on;
- proxy_intercept_errors on;
- error_page 301 302 307 = @handle_redirect;
- }
-
- location /internal/assets {
- internal;
- alias $gitpod_repo_root/backend/assets;
- add_header x-internal-redirect "$upstream_http_x_accel_redirect";
- }
-
- location /api {
- proxy_pass http://127.0.0.1:6060/api;
- }
-
- location /webhooks {
- proxy_pass http://127.0.0.1:6060/webhooks;
- }
-
- location /dbg {
- proxy_pass http://127.0.0.1:6060/dbg;
- }
-
- location /export {
- proxy_pass http://127.0.0.1:6061;
- }
-
- location /playground {
- alias $gitpod_repo_root/experiments/;
- add_header Cache-Control "no-cache, max-age=0";
- autoindex on;
- }
-
- location /ws/notifications {
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection 'upgrade';
- proxy_pass http://127.0.0.1:6060/ws/notifications;
- }
-
- location / {
- add_header Cache-Control "no-cache, max-age=0";
-
- location ~ ^/(/|css|fonts|images|js|wasm) {
- }
-
- location ~ ^/[^/]+/(.*)$ {
- return 301 " /404";
- }
-
- try_files $uri /index.html$is_args$args =404;
- }
- }
-}
diff --git a/docker/gitpod/files/postgresql_init.sql b/docker/gitpod/files/postgresql_init.sql
deleted file mode 100644
index 1766a643d2..0000000000
--- a/docker/gitpod/files/postgresql_init.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-CREATE DATABASE penpot;
-CREATE USER penpot PASSWORD 'penpot';
-ALTER ROLE penpot SUPERUSER;
diff --git a/docker/images/Dockerfile.backend b/docker/images/Dockerfile.backend
index 3edb969257..c2f4c5e6b7 100644
--- a/docker/images/Dockerfile.backend
+++ b/docker/images/Dockerfile.backend
@@ -1,4 +1,4 @@
-FROM dhi.io/debian-base:trixie-debian13-dev@sha256:af61a3296b0c92f16969f11ce8c2a93722e84c9e5c1bb42ed6afec796be71b04 AS build
+FROM dhi.io/debian-base:trixie-debian13-dev@sha256:f90fd43cdf3dd94840b4dc3a2a39fd2a08578e40e7895535e2e20a1275ba6013 AS build
LABEL maintainer="Penpot