From aa12e5208136804cbf8f80870bd4f36c69bee438 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 18 Nov 2026 12:51:30 +0100 Subject: [PATCH] :arrow_up: Update the system dependencies of the devenv and the images (#13144) * :arrow_up: Bump the JDK to 27.0.1.1 on devenv and the backend image The devenv image compiled the backend bundle with JDK 27 while the production image ran JDK 26. The runtime starts with --enable-preview, so a runtime line behind the compiler line is a silent trap rather than a working setup. Both pins now use Zulu 27.0.1.1 (zulu27.30.201-ca), the current GA of the line, with the same sums on both architectures. The jlink module list in the backend image still resolves on 27, so it does not change. Sums checked by downloading both tarballs; the jlink JRE built from them starts and reports 27.0.1.1. AI-assisted-by: deepseek-v4.1-flash * :fire: Remove the unused gitpod setup No workflow built docker/gitpod and its AdoptOpenJDK 16 install no longer matches the devenv. The README badge linked to a setup that no longer exists, so it goes with it. The historical changelog entry stays: CHANGES.md is generated from the milestones. AI-assisted-by: deepseek-v4.1-flash * :arrow_up: Bring the docker/ updates from develop Move the devenv and the production images to what develop already carries: - Base images to the current dhi.io digests. - Node 24.22.3 and pnpm 12.21.0 in the devenv image and in every production Dockerfile that ships pnpm. - Rust 1.99.0 and Serena 2.1.0, with SERENA_UPDATE_VERSION raised to match and a note that it must never be lower than the image pin. - tini as the exporter ENTRYPOINT. Devenv additions: PENPOT_DEVENV=true so the frontend compiles with the admin console disabled by default, xauth and libvulkan1 plus the GPU compose overlay, the MCP OAuth metadata route in nginx, and clipboard support in tmux. The JDK stays at 27.0.1.1 on both pins. AI-assisted-by: deepseek-v4.1-flash * :arrow_up: Finish the Node 24.22.3 bump outside docker/ The docker/ import brought Node 24.22.3 into the devenv and the image tags while .nvmrc and the two plugins-deploy workflows stayed on 24.22.2. Node stays on the 24.x line on every site: the plugins-deploy runtime pins follow .nvmrc, even though develop moved them to node@26.13.1 in 99db795966. AI-assisted-by: deepseek-v4.1-flash --- .github/workflows/plugins-deploy-api-doc.yml | 2 +- .../workflows/plugins-deploy-styles-doc.yml | 2 +- .nvmrc | 2 +- .serena/memories/workflow/docker-images.md | 3 +- .serena/memories/workflow/updating-node.md | 1 + README.md | 3 - docker/devenv/Dockerfile | 30 ++-- docker/devenv/docker-compose.gpu.yml | 14 ++ docker/devenv/docker-compose.main.yml | 8 +- docker/devenv/files/nginx.conf | 5 + docker/devenv/files/tmux.conf | 3 + docker/gitpod/Dockerfile | 122 --------------- docker/gitpod/files/nginx-mime.types | 100 ------------ docker/gitpod/files/nginx.conf | 145 ------------------ docker/gitpod/files/postgresql_init.sql | 3 - docker/images/Dockerfile.backend | 12 +- docker/images/Dockerfile.exporter | 10 +- docker/images/Dockerfile.frontend | 2 +- docker/images/Dockerfile.mcp | 10 +- docker/images/Dockerfile.media-processor | 8 +- docker/images/Dockerfile.storybook | 2 +- 21 files changed, 75 insertions(+), 412 deletions(-) create mode 100644 docker/devenv/docker-compose.gpu.yml delete mode 100644 docker/gitpod/Dockerfile delete mode 100644 docker/gitpod/files/nginx-mime.types delete mode 100644 docker/gitpod/files/nginx.conf delete mode 100644 docker/gitpod/files/postgresql_init.sql diff --git a/.github/workflows/plugins-deploy-api-doc.yml b/.github/workflows/plugins-deploy-api-doc.yml index ed7ec0e978..eb2a75c0e3 100644 --- a/.github/workflows/plugins-deploy-api-doc.yml +++ b/.github/workflows/plugins-deploy-api-doc.yml @@ -51,7 +51,7 @@ jobs: uses: pnpm/setup@a0881977cd8ea73b1ed212236c99ca10dcc80cf4 # v3.1.1 with: working-directory: plugins - runtime: node@24.22.2 + runtime: node@24.22.3 install: false - name: Install deps diff --git a/.github/workflows/plugins-deploy-styles-doc.yml b/.github/workflows/plugins-deploy-styles-doc.yml index 72b67fa1cb..262ae98af1 100644 --- a/.github/workflows/plugins-deploy-styles-doc.yml +++ b/.github/workflows/plugins-deploy-styles-doc.yml @@ -49,7 +49,7 @@ jobs: uses: pnpm/setup@a0881977cd8ea73b1ed212236c99ca10dcc80cf4 # v3.1.1 with: working-directory: plugins - runtime: node@24.22.2 + runtime: node@24.22.3 install: false - name: Install deps diff --git a/.nvmrc b/.nvmrc index 86456ddf02..22fbfc060a 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v24.22.2 +v24.22.3 diff --git a/.serena/memories/workflow/docker-images.md b/.serena/memories/workflow/docker-images.md index 28d42bc9e7..3415c8247d 100644 --- a/.serena/memories/workflow/docker-images.md +++ b/.serena/memories/workflow/docker-images.md @@ -2,5 +2,6 @@ Node and pnpm pins: `mem:workflow/updating-node` and `mem:workflow/updating-pnpm`. Only the parts the Dockerfiles cannot show: -- JDK: the image tracks a non-LTS line, so there is no minor to pick — the last build of the line is the ceiling; moving line is a major and needs a real build to validate the `jlink` module list. +- JDK: two pins that move together — `docker/devenv/Dockerfile` (`setup-jvm` stage, full JDK) and `docker/images/Dockerfile.backend` (JDK + `jlink` runtime). Same build, same sums in both. They compile and run the same backend: `manage.sh` builds the bundle inside the devenv image (`build-backend-bundle` → `build "backend"`) and `backend/scripts/run.template.sh` starts the runtime with `--enable-preview`, which requires the runtime major to match the compiler major. A runtime line behind the compiler line is a silent trap. +- JDK line: tracks a non-LTS line, so there is no minor to pick — the last build of the line is the ceiling; moving line is a major and needs a real build to validate the `jlink` module list (`--add-modules` in `Dockerfile.backend`). JDK 27 keeps all of them; check with `bin/jlink --add-modules ` 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=&os=linux&arch=&java_package_type=jdk&archive_type=tar.gz&latest=true&release_status=ga&availability_types=CA`), then confirm the sums by downloading the tarball and running `sha256sum`. - ImageMagick: publish `penpotapp/imagemagick:` **before** bumping the `COPY --from` refs in the backend, exporter and devenv Dockerfiles; otherwise both builds break on the missing tag. diff --git a/.serena/memories/workflow/updating-node.md b/.serena/memories/workflow/updating-node.md index 5a05836745..f682513df0 100644 --- a/.serena/memories/workflow/updating-node.md +++ b/.serena/memories/workflow/updating-node.md @@ -18,6 +18,7 @@ No single source of truth: nothing reads `.nvmrc` at build time, and the version - Renovate also opens these bumps, on `renovate-*` branches and with its config living outside this repo; a manual bump and Renovate's must not diverge on any of the six sites. - A backport merge can deliver a newer Node into `docker/` and the plugins-deploy workflows while main's `.nvmrc` stays behind, because main receives partial backports of `.github/` and `docker/` from develop. Merging main into staging therefore conflicts on the pin lines: take main's set and finish the bump (`.nvmrc` plus the `packageManager` fields via `mem:workflow/updating-pnpm`), or the six sites drift. - The newer version wins in both directions. A maintenance→main merge (`main-2.18.x` into `main`) can carry the newer Node while `.nvmrc` and the `packageManager` fields stay on the older pair; then adopt the newer set and finish the bump on all six sites plus the 35 `packageManager` fields. +- Node stays on the 24.x line even when the rest of `.github/` moves on: `99db795966` (`update GitHub Actions`) took the two `plugins-deploy-*` `runtime:` pins to `node@26.13.1` on develop while `.nvmrc` stayed on `v24.22.3`. The project keeps every site on the `.nvmrc` value; resolve that conflict back to the 24.x pin instead of taking develop's. - Both workflows must stay valid YAML. The `python3` in the devenv has no `yaml` module, so validate with `uv run --with pyyaml python3 -c ...` instead of a bare import. ## Verification diff --git a/README.md b/README.md index ffd702aa31..831eaf8d8a 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,6 @@ Managed with Taiga.io - - Gitpod ready-to-code -

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 " ENV LANG='C.UTF-8' \ @@ -27,12 +27,12 @@ RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ - ESUM='8ff07320636ef5b30f0d7e16687932df52255c3ef3ffd920a6aae3723511ce7f'; \ - BINARY_URL='https://cdn.azul.com/zulu/bin/zulu26.32.203-ca-jdk26.0.2.1-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='c6b810ca659e3293205444f47ac4af163396fd6d025c51fd5f767e628b2ceede'; \ - BINARY_URL='https://cdn.azul.com/zulu/bin/zulu26.32.203-ca-jdk26.0.2.1-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}"; \ @@ -53,7 +53,7 @@ RUN set -eux; \ --output /opt/jre; -FROM dhi.io/debian-base:trixie-debian13-dev@sha256:af61a3296b0c92f16969f11ce8c2a93722e84c9e5c1bb42ed6afec796be71b04 AS image +FROM dhi.io/debian-base:trixie-debian13-dev@sha256:f90fd43cdf3dd94840b4dc3a2a39fd2a08578e40e7895535e2e20a1275ba6013 AS image LABEL maintainer="Penpot " ENV LANG='C.UTF-8' \ diff --git a/docker/images/Dockerfile.exporter b/docker/images/Dockerfile.exporter index bb6fa216da..3d3b97b3de 100644 --- a/docker/images/Dockerfile.exporter +++ b/docker/images/Dockerfile.exporter @@ -1,4 +1,4 @@ -FROM dhi.io/node:24.22.2-debian13-dev@sha256:df819cfcb0de8a9e461bb8437d96d6fcfac341e565129e50597338756a88db5b +FROM dhi.io/node:24.22.3-debian13-dev@sha256:dee4bb11f4cb32ad31000287af8795f772ac801338a166a0e9fbbadd9674a2f8 LABEL maintainer="Penpot " ENV LANG=en_US.UTF-8 \ @@ -17,6 +17,7 @@ RUN set -ex; \ locales \ ca-certificates \ gzip \ + tini \ ; \ apt-get clean; \ rm -rf /var/lib/apt/lists/*; \ @@ -95,17 +96,17 @@ WORKDIR /opt/penpot/exporter # pnpm ships as a system binary (same tarball + SHA pin as # docker/devenv/Dockerfile); the generated ./setup expects it on PATH. # Corepack is gone from Node 25+, so nothing here may use it. -ARG PNPM_VERSION=12.16.1 +ARG PNPM_VERSION=12.21.0 RUN set -eux; \ ARCH="$(dpkg --print-architecture)"; \ case "${ARCH}" in \ aarch64|arm64) \ PNPM_ARCH='arm64'; \ - PNPM_SHA256='f5847699e5d528f8f8e9bcfb385e58cb9fba7482af1b1aa7b70737be42277f81'; \ + PNPM_SHA256='6c5913a48c93b3a556b71c3bd9bf12c6bf9fbfbbbd2dcbd1d52a85c539751b9e'; \ ;; \ amd64|x86_64) \ PNPM_ARCH='x64'; \ - PNPM_SHA256='565ff81174a14f6f7bd5d84c1b17e51031a80230d370a1fe24be5d16bd02a825'; \ + PNPM_SHA256='84c4773bcf4a217f4083cd7b2a91e4cee6103cf42426c1282ef37d308f55a410'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ @@ -126,4 +127,5 @@ RUN ./setup && chown -R penpot:penpot /opt/penpot/exporter USER penpot:penpot +ENTRYPOINT ["/usr/bin/tini", "-s", "--"] CMD ["node", "app.js"] diff --git a/docker/images/Dockerfile.frontend b/docker/images/Dockerfile.frontend index aba52d5bcc..1be6ee9680 100644 --- a/docker/images/Dockerfile.frontend +++ b/docker/images/Dockerfile.frontend @@ -1,4 +1,4 @@ -FROM dhi.io/nginx:1.31.8-debian13-dev@sha256:f69a0ea1762c51080fe96ce5f12103fb2977231308ae1784acd915bf63a0a1a2 +FROM dhi.io/nginx:1.31.8-debian13-dev@sha256:5f75855fe078ae96027706da06716fbe1c3dbb618fc603e61894e1b41adc56d7 LABEL maintainer="Penpot " ENV DEBIAN_FRONTEND=noninteractive diff --git a/docker/images/Dockerfile.mcp b/docker/images/Dockerfile.mcp index 4054a613b0..7d2d5987cf 100644 --- a/docker/images/Dockerfile.mcp +++ b/docker/images/Dockerfile.mcp @@ -1,4 +1,4 @@ -FROM dhi.io/node:24.22.2-debian13-dev@sha256:df819cfcb0de8a9e461bb8437d96d6fcfac341e565129e50597338756a88db5b AS build +FROM dhi.io/node:24.22.3-debian13-dev@sha256:dee4bb11f4cb32ad31000287af8795f772ac801338a166a0e9fbbadd9674a2f8 AS build LABEL maintainer="Penpot " ENV DEBIAN_FRONTEND=noninteractive @@ -11,7 +11,7 @@ WORKDIR /opt/penpot/mcp # pnpm ships as a system binary (same tarball + SHA pin as # docker/devenv/Dockerfile); ./setup expects it on PATH. # Corepack is gone from Node 25+, so nothing here may use it. -ARG PNPM_VERSION=12.16.1 +ARG PNPM_VERSION=12.21.0 RUN set -eux; \ apt-get -qq update; \ apt-get -qqy --no-install-recommends install curl ca-certificates gzip; \ @@ -20,11 +20,11 @@ RUN set -eux; \ case "${ARCH}" in \ aarch64|arm64) \ PNPM_ARCH='arm64'; \ - PNPM_SHA256='f5847699e5d528f8f8e9bcfb385e58cb9fba7482af1b1aa7b70737be42277f81'; \ + PNPM_SHA256='6c5913a48c93b3a556b71c3bd9bf12c6bf9fbfbbbd2dcbd1d52a85c539751b9e'; \ ;; \ amd64|x86_64) \ PNPM_ARCH='x64'; \ - PNPM_SHA256='565ff81174a14f6f7bd5d84c1b17e51031a80230d370a1fe24be5d16bd02a825'; \ + PNPM_SHA256='84c4773bcf4a217f4083cd7b2a91e4cee6103cf42426c1282ef37d308f55a410'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ @@ -42,7 +42,7 @@ RUN set -eux; \ RUN ./setup -FROM dhi.io/node:24.22.2-debian13@sha256:ce582f85254ceba6c572a854b8fb4008ced2f5d365c929f4f580360829037184 AS image +FROM dhi.io/node:24.22.3-debian13@sha256:84adaf3bdd9fa350e753078db2928a1584e481e11225d14f96014b17ffc96c5a AS image LABEL maintainer="Penpot " ENV LANG=en_US.UTF-8 \ diff --git a/docker/images/Dockerfile.media-processor b/docker/images/Dockerfile.media-processor index 218fd84ecd..f81a983399 100644 --- a/docker/images/Dockerfile.media-processor +++ b/docker/images/Dockerfile.media-processor @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM dhi.io/node:24.22.2-debian13-dev@sha256:df819cfcb0de8a9e461bb8437d96d6fcfac341e565129e50597338756a88db5b +FROM dhi.io/node:24.22.3-debian13-dev@sha256:dee4bb11f4cb32ad31000287af8795f772ac801338a166a0e9fbbadd9674a2f8 LABEL maintainer="Penpot " ENV LANG=en_US.UTF-8 \ @@ -58,7 +58,7 @@ WORKDIR /opt/penpot/media-processor # pnpm ships as a system binary (same tarball + SHA pin as # docker/devenv/Dockerfile); ./setup expects it on PATH. # Corepack is gone from Node 25+, so nothing here may use it. -ARG PNPM_VERSION=12.16.1 +ARG PNPM_VERSION=12.21.0 RUN set -eux; \ apt-get -qq update; \ apt-get -qqy --no-install-recommends install gzip; \ @@ -67,11 +67,11 @@ RUN set -eux; \ case "${ARCH}" in \ aarch64|arm64) \ PNPM_ARCH='arm64'; \ - PNPM_SHA256='f5847699e5d528f8f8e9bcfb385e58cb9fba7482af1b1aa7b70737be42277f81'; \ + PNPM_SHA256='6c5913a48c93b3a556b71c3bd9bf12c6bf9fbfbbbd2dcbd1d52a85c539751b9e'; \ ;; \ amd64|x86_64) \ PNPM_ARCH='x64'; \ - PNPM_SHA256='565ff81174a14f6f7bd5d84c1b17e51031a80230d370a1fe24be5d16bd02a825'; \ + PNPM_SHA256='84c4773bcf4a217f4083cd7b2a91e4cee6103cf42426c1282ef37d308f55a410'; \ ;; \ *) \ echo "Unsupported arch: ${ARCH}"; \ diff --git a/docker/images/Dockerfile.storybook b/docker/images/Dockerfile.storybook index bf67fabf88..25a007a82a 100644 --- a/docker/images/Dockerfile.storybook +++ b/docker/images/Dockerfile.storybook @@ -1,4 +1,4 @@ -FROM dhi.io/nginx:1.31.8-alpine3.24@sha256:7a4e9021737f414ad0f851efb939600690d9d092f51712ce6512bfd0a767ceae +FROM dhi.io/nginx:1.31.8-alpine3.24@sha256:ad079e1004e4ec4ec14dfc29612d542161a80bc4bf9735b8f6303dc45e588ce0 LABEL maintainer="Penpot " ARG BUNDLE_PATH="./bundle-storybook/"