From 96dce94efe4caeefc45949a417a90a47fc86e461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20Gro=C3=9Fe?= <34819304+scientes@users.noreply.github.com> Date: Wed, 12 Mar 2025 19:47:20 +0100 Subject: [PATCH 1/2] fix 0.29.2 build --- Dockerfile | 2 +- Dockerfile-generator | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6815b4a..e9b4d3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,4 +14,4 @@ EXPOSE 3000 ENTRYPOINT [] -CMD ["bundle", "exec", "rails", "s", "-b", "0.0.0.0"] +CMD ["bundle", "exec", "rails", "s", "-b", "0.0.0.0"] \ No newline at end of file diff --git a/Dockerfile-generator b/Dockerfile-generator index 4a7c527..6d2b25e 100644 --- a/Dockerfile-generator +++ b/Dockerfile-generator @@ -1,9 +1,9 @@ -ARG ruby_version=2.7.5 +ARG ruby_version=3.2.0 FROM ruby:${ruby_version} LABEL maintainer="hola@decidim.org" -ARG decidim_version=0.26.2 +ARG decidim_version=0.29.2 ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 @@ -13,11 +13,11 @@ WORKDIR /code RUN apt-get install -y git imagemagick wget \ && apt-get clean -RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - \ +RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - \ && apt-get install -y nodejs \ && apt-get clean -RUN npm install -g npm@7.21.1 +RUN npm install -g npm RUN npm install -g yarn@1.22.18 RUN gem install bundler --version '>= 2.3.12' \ From dc05ad765e4024a1e3aff44ea9670eaabd2e24ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20Gro=C3=9Fe?= <34819304+scientes@users.noreply.github.com> Date: Wed, 12 Mar 2025 19:51:17 +0100 Subject: [PATCH 2/2] pin npm --- Dockerfile-generator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-generator b/Dockerfile-generator index 6d2b25e..8e7147a 100644 --- a/Dockerfile-generator +++ b/Dockerfile-generator @@ -17,7 +17,7 @@ RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - \ && apt-get install -y nodejs \ && apt-get clean -RUN npm install -g npm +RUN npm install -g npm@11.2.0 RUN npm install -g yarn@1.22.18 RUN gem install bundler --version '>= 2.3.12' \