diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile index ed3e672773..351499df2c 100644 --- a/docker/devenv/Dockerfile +++ b/docker/devenv/Dockerfile @@ -6,7 +6,7 @@ ENV LANG='C.UTF-8' \ RUN set -ex; \ apt-get -qq update; \ - apt-get -qq upgrade; \ + apt-get -qq dist-upgrade; \ apt-get -qqy --no-install-recommends install \ python3 \ unzip \ @@ -353,6 +353,7 @@ RUN set -ex; \ RUN set -ex; \ apt-get -qq update; \ + apt-get -qq dist-upgrade; \ apt-get -qqy install --no-install-recommends \ redis-tools \ gnupg2 \ @@ -435,6 +436,7 @@ RUN set -ex; \ 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; \ + apt-get clean; \ rm -rf /var/lib/apt/lists/*; diff --git a/docker/images/Dockerfile.backend b/docker/images/Dockerfile.backend index 7934b49cf7..583da3612d 100644 --- a/docker/images/Dockerfile.backend +++ b/docker/images/Dockerfile.backend @@ -1,4 +1,4 @@ -FROM ubuntu:24.04 AS build +FROM ubuntu:26.04 AS build LABEL maintainer="Penpot " ENV LANG='C.UTF-8' \ @@ -9,7 +9,7 @@ ENV LANG='C.UTF-8' \ RUN set -ex; \ apt-get -qq update; \ - apt-get -qq upgrade; \ + apt-get -qq dist-upgrade; \ apt-get -qqy --no-install-recommends install \ binutils \ ca-certificates \ @@ -47,7 +47,7 @@ RUN set -eux; \ --add-modules java.base,jdk.net,jdk.management.agent,java.se,jdk.compiler,jdk.javadoc,jdk.attach,jdk.unsupported,jdk.jfr,jdk.jcmd \ --output /opt/jre; -FROM ubuntu:24.04 AS image +FROM ubuntu:26.04 AS image LABEL maintainer="Penpot " ENV LANG='C.UTF-8' \ @@ -60,7 +60,7 @@ ENV LANG='C.UTF-8' \ RUN set -ex; \ useradd -U -M -u 1001 -s /bin/false -d /opt/penpot penpot; \ apt-get -qq update; \ - apt-get -qq upgrade; \ + apt-get -qq dist-upgrade; \ apt-get -qqy --no-install-recommends install \ ca-certificates \ curl \ @@ -81,8 +81,8 @@ RUN set -ex; \ libwebp7 \ libwebpdemux2 \ libwebpmux3 \ - libxml2 \ - libzip4t64 \ + libxml2-16 \ + libzip5 \ libzstd1 \ python3 \ python3-tabulate \ @@ -100,7 +100,7 @@ RUN set -ex; \ chown -R penpot:penpot /opt/data; COPY --from=build /opt/jre /opt/jre -COPY --from=penpotapp/imagemagick:7.1.2-13 /opt/imagick /opt/imagick +COPY --from=penpotapp/imagemagick:7.1.2-24 /opt/imagick /opt/imagick COPY files/imagemagick-policy.xml /opt/imagick/etc/ImageMagick-7/policy.xml diff --git a/docker/images/Dockerfile.exporter b/docker/images/Dockerfile.exporter index 2d028b5ff6..a92b87d184 100644 --- a/docker/images/Dockerfile.exporter +++ b/docker/images/Dockerfile.exporter @@ -1,4 +1,4 @@ -FROM ubuntu:24.04 +FROM ubuntu:26.04 LABEL maintainer="Penpot " ENV LANG=en_US.UTF-8 \ @@ -13,7 +13,7 @@ RUN set -ex; \ mkdir -p /etc/resolvconf/resolv.conf.d; \ echo "nameserver 127.0.0.11" > /etc/resolvconf/resolv.conf.d/tail; \ apt-get -qq update; \ - apt-get -qq upgrade; \ + apt-get -qq dist-upgrade; \ apt-get -qqy --no-install-recommends install \ curl \ tzdata \ @@ -78,8 +78,8 @@ RUN set -ex; \ libwebp7 \ libwebpdemux2 \ libwebpmux3 \ - libxml2 \ - libzip4t64 \ + libxml2-16 \ + libzip5 \ libzstd1 \ ; \ apt-get clean; \ @@ -111,7 +111,7 @@ RUN set -eux; \ ARG BUNDLE_PATH="./bundle-exporter/" COPY --chown=penpot:penpot $BUNDLE_PATH /opt/penpot/exporter/ -COPY --from=penpotapp/imagemagick:7.1.2-13 /opt/imagick /opt/imagick +COPY --from=penpotapp/imagemagick:7.1.2-24 /opt/imagick /opt/imagick WORKDIR /opt/penpot/exporter USER penpot:penpot diff --git a/docker/images/Dockerfile.frontend b/docker/images/Dockerfile.frontend index fe1ba7833c..0772aab00c 100644 --- a/docker/images/Dockerfile.frontend +++ b/docker/images/Dockerfile.frontend @@ -1,4 +1,4 @@ -FROM nginxinc/nginx-unprivileged:1.30.2-alpine +FROM nginxinc/nginx-unprivileged:1.31.1-alpine LABEL maintainer="Penpot " USER root diff --git a/docker/images/Dockerfile.mcp b/docker/images/Dockerfile.mcp index f13fbd5e99..96cf10f824 100644 --- a/docker/images/Dockerfile.mcp +++ b/docker/images/Dockerfile.mcp @@ -1,4 +1,4 @@ -FROM ubuntu:24.04 +FROM ubuntu:26.04 LABEL maintainer="Penpot " ENV LANG=en_US.UTF-8 \ @@ -13,7 +13,7 @@ RUN set -ex; \ mkdir -p /etc/resolvconf/resolv.conf.d; \ echo "nameserver 127.0.0.11" > /etc/resolvconf/resolv.conf.d/tail; \ apt-get -qq update; \ - apt-get -qq upgrade; \ + apt-get -qq dist-upgrade; \ apt-get -qqy --no-install-recommends install \ curl \ tzdata \ diff --git a/docker/images/Dockerfile.storybook b/docker/images/Dockerfile.storybook index 9eb5a55663..26bb326383 100644 --- a/docker/images/Dockerfile.storybook +++ b/docker/images/Dockerfile.storybook @@ -1,4 +1,4 @@ -FROM nginxinc/nginx-unprivileged:1.30.2-alpine +FROM nginxinc/nginx-unprivileged:1.31.1-alpine LABEL maintainer="Penpot " USER root