Skip to content

Commit 30348bd

Browse files
github-actions[bot]github-actions[bot]
committed
Saving new files for 25.2.1.3
1 parent 919d0a3 commit 30348bd

File tree

3 files changed

+85
-59
lines changed

3 files changed

+85
-59
lines changed

‎repo-integrations/remediate/Dockerfile‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
ARG BASE_IMAGE=amd64/ubuntu:24.04
33

44
# This containerbase is used for tool intallation and user/directory setup
5-
FROM ghcr.io/containerbase/base:13.8.17@sha256:24a4dd4ac98c5f9cedaaae344b84157106d9538f97720a48be4e652fc04fee07 AS containerbase
5+
FROM ghcr.io/containerbase/base:13.7.9@sha256:581c542f5678879acfd3ee72e5161b0dffd6ac3ba0a6b4d64978351897253df4 AS containerbase
66

7-
FROM ${BASE_IMAGE} AS base
7+
FROM ${BASE_IMAGE} as base
88

99
RUN apt-get update -y && apt-get upgrade -y && apt-get clean && rm -rf /var/lib/apt/lists/*
1010

1111
# The containerbase supports custom user but Renovate requires ubuntu
1212
ARG USER_NAME=ubuntu
1313
ARG USER_ID=1000
14-
ARG APP_ROOT=/usr/src/mend
14+
ARG APP_ROOT=/usr/src/app
1515

1616
# Set env and shell
1717
ENV BASH_ENV=/usr/local/etc/env
@@ -29,7 +29,7 @@ RUN install-containerbase && \
2929
# --------------------------------------------------------------
3030

3131
# renovate: datasource=github-tags depName=git packageName=git/git
32-
ARG GIT_VERSION=v2.49.0
32+
ARG GIT_VERSION=v2.48.1
3333
RUN install-tool git
3434

3535
# install git-lfs
@@ -38,7 +38,7 @@ RUN install-tool git
3838
#ENV RENOVATE_GIT_NO_VERIFY=commit
3939

4040
# renovate: datasource=github-releases depName=node packageName=nodejs/node versioning=node
41-
ARG NODE_VERSION=22.15.0
41+
ARG NODE_VERSION=22.13.1
4242
RUN install-tool node
4343

4444
# Copy and validate the expected node runtime installation path used by the worker for executing the Renovate CLI
@@ -49,7 +49,7 @@ RUN COERCED_NODE_VERSION=$(node -v | grep '^v2' | sed 's/^v//') && \
4949
RUN $DOCKERFILE_NODE_DEFAULT_PATH --version
5050

5151
# renovate: datasource=npm depName=npm versioning=npm
52-
ARG NPM_VERSION=10.9.2
52+
ARG NPM_VERSION=9.9.4
5353
RUN install-tool npm
5454

5555
# renovate: datasource=npm depName=yarn versioning=npm
@@ -61,35 +61,35 @@ RUN install-tool yarn
6161
# -------------------------------------------------------------------------------------
6262

6363
# renovate: datasource=adoptium-java depName=java
64-
ARG JAVA_VERSION=11.0.27+6
64+
ARG JAVA_VERSION=11.0.26+4
6565
RUN install-tool java
6666

6767
# renovate: datasource=gradle-version depName=gradle versioning=gradle
68-
ARG GRADLE_VERSION=8.14
68+
ARG GRADLE_VERSION=8.12.1
6969
RUN install-tool gradle
7070

7171
# renovate: datasource=github-releases depName=erlang packageName=containerbase/erlang-prebuild versioning=docker
72-
ARG ERLANG_VERSION=27.3.3.0
72+
ARG ERLANG_VERSION=27.2.1.0
7373
RUN install-tool erlang
7474

7575
# renovate: datasource=docker depName=elixir versioning=docker
76-
ARG ELIXIR_VERSION=1.18.3
76+
ARG ELIXIR_VERSION=1.18.1
7777
RUN install-tool elixir
7878

7979
# renovate: datasource=github-releases depName=php packageName=containerbase/php-prebuild
80-
ARG PHP_VERSION=8.4.6
80+
ARG PHP_VERSION=8.4.3
8181
RUN install-tool php
8282

8383
# renovate: datasource=github-releases depName=composer packageName=composer/composer
84-
ARG COMPOSER_VERSION=2.8.8
84+
ARG COMPOSER_VERSION=2.8.5
8585
RUN install-tool composer
8686

8787
# renovate: datasource=docker depName=golang versioning=docker
88-
ARG GOLANG_VERSION=1.24.2
88+
ARG GOLANG_VERSION=1.23.6
8989
RUN install-tool golang
9090

9191
# renovate: datasource=github-releases depName=python packageName=containerbase/python-prebuild
92-
ARG PYTHON_VERSION=3.13.3
92+
ARG PYTHON_VERSION=3.13.2
9393
RUN install-tool python
9494

9595
# renovate: datasource=pypi depName=pipenv
@@ -105,15 +105,15 @@ ARG HASHIN_VERSION=1.0.3
105105
RUN install-tool hashin
106106

107107
# renovate: datasource=docker depName=rust versioning=docker
108-
ARG RUST_VERSION=1.86.0
108+
ARG RUST_VERSION=1.84.1
109109
RUN install-tool rust
110110

111111
# renovate: datasource=github-releases depName=ruby packageName=containerbase/ruby-prebuild versioning=ruby
112-
ARG RUBY_VERSION=3.4.3
112+
ARG RUBY_VERSION=3.4.1
113113
RUN install-tool ruby
114114

115115
# renovate: datasource=rubygems depName=bundler
116-
ARG BUNDLER_VERSION=2.6.8
116+
ARG BUNDLER_VERSION=2.6.3
117117
RUN install-tool bundler
118118

119119
# renovate: datasource=rubygems depName=cocoapods versioning=ruby
@@ -125,11 +125,11 @@ ARG PNPM_VERSION=8.15.9
125125
RUN install-tool pnpm
126126

127127
# renovate: datasource=docker depName=dotnet packageName=mcr.microsoft.com/dotnet/sdk
128-
ARG DOTNET_VERSION=8.0.408
128+
ARG DOTNET_VERSION=6.0.425
129129
RUN install-tool dotnet
130130

131131
# renovate: datasource=github-releases depName=helm packageName=helm/helm
132-
ARG HELM_VERSION=v3.17.3
132+
ARG HELM_VERSION=v3.17.0
133133
RUN install-tool helm
134134

135135
# END OF BASE IMAGE

‎repo-integrations/scanner/Dockerfile‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,13 @@ RUN install-tool java
7272
ARG GRADLE_VERSION=6.9.4
7373
RUN install-tool gradle
7474

75-
# renovate: datasource=gradle-version depName=gradle versioning=gradle
76-
ARG GRADLE_VERSION=7.6.2
77-
RUN install-tool gradle
78-
7975
### !!! PAY ATTENTION! The version that should be the default, must be installed last !!! ###
8076
# renovate: datasource=gradle-version depName=gradle versioning=gradle
81-
ARG GRADLE_VERSION=8.13
77+
ARG GRADLE_VERSION=7.6.2
8278
RUN install-tool gradle
8379

8480
# renovate: datasource=docker depName=golang versioning=docker
85-
#ARG GOLANG_VERSION=1.22.2
81+
#ARG GOLANG_VERSION=1.24.0
8682
#RUN install-tool golang
8783
# A temporary workaround, until it is fixed by renovate
8884
#ENV GOSUMDB="sum.golang.org"
@@ -141,10 +137,6 @@ RUN install-tool python
141137
ARG PYTHON_VERSION=3.8.12
142138
RUN install-tool python
143139

144-
# renovate: datasource=github-releases depName=python lookupName=containerbase/python-prebuild
145-
ARG PYTHON_VERSION=3.13.0
146-
RUN install-tool python
147-
148140
# renovate: datasource=github-releases depName=python packageName=containerbase/python-prebuild
149141
ARG PYTHON_VERSION=3.9.18
150142
RUN install-tool python
@@ -234,7 +226,7 @@ RUN install-tool poetry
234226
#ENV PATH ${USER_HOME}/.rbenv/bin:$PATH
235227

236228
# renovate: datasource=rubygems depName=cocoapods versioning=ruby
237-
# ARG COCOAPODS_VERSION=1.11.2
229+
# ARG COCOAPODS_VERSION=1.16.2
238230
# RUN install-tool cocoapods
239231
# RUN adduser cocoapods
240232
# USER cocoapods
@@ -315,15 +307,36 @@ RUN apt-get update && \
315307

316308

317309
#### Install R and Packrat
318-
#RUN apt-get update && \
319-
# apt-get install -y r-base libopenblas-base r-base gdebi && \
320-
# wget https://download2.rstudio.org/server/bionic/amd64/rstudio-server-2021.09.1-372-amd64.deb && \
321-
# gdebi rstudio-server-2021.09.1-372-amd64.deb && \
322-
# rm rstudio-server-2021.09.1-372-amd64.deb && \
323-
# R -e 'install.packages("packrat" , repos="http://cran.us.r-project.org");' && \
324-
# apt-get clean && \
325-
# rm -rf /var/lib/apt/lists/* && \
326-
# rm -rf /tmp/*
310+
# Set environment variables to avoid interactive prompts
311+
# ENV DEBIAN_FRONTEND=noninteractive
312+
# ENV TZ=UTC
313+
# Update system and install dependencies
314+
#RUN apt-get update && apt-get install -y \
315+
# software-properties-common \
316+
# dirmngr \
317+
# lsb-release \
318+
# build-essential \
319+
# gfortran \
320+
# libcurl4-openssl-dev \
321+
# libssl-dev \
322+
# libxml2-dev \
323+
# libfontconfig1-dev \
324+
# libharfbuzz-dev \
325+
# libfribidi-dev \
326+
# libfreetype6-dev \
327+
# libpng-dev \
328+
# libtiff5-dev \
329+
# libjpeg-dev \
330+
# git \
331+
# && rm -rf /var/lib/apt/lists/*
332+
## Add CRAN repository and install R
333+
#RUN wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | gpg --dearmor -o /usr/share/keyrings/r-project.gpg && \
334+
# echo "deb [signed-by=/usr/share/keyrings/r-project.gpg] https://cloud.r-project.org/bin/linux/ubuntu noble-cran40/" | tee -a /etc/apt/sources.list.d/r-project.list && \
335+
# apt-get update && \
336+
# apt-get install -y r-base r-base-dev && \
337+
# rm -rf /var/lib/apt/lists/*
338+
## Install devtools and packrat from R
339+
#RUN R -e "install.packages(c('devtools', 'packrat'), repos='https://cloud.r-project.org/')"
327340

328341

329342
#### Install Cabal

‎repo-integrations/scanner/Dockerfile.full‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,13 @@ RUN install-tool java
7272
ARG GRADLE_VERSION=6.9.4
7373
RUN install-tool gradle
7474

75-
# renovate: datasource=gradle-version depName=gradle versioning=gradle
76-
ARG GRADLE_VERSION=7.6.2
77-
RUN install-tool gradle
78-
7975
### !!! PAY ATTENTION! The version that should be the default, must be installed last !!! ###
8076
# renovate: datasource=gradle-version depName=gradle versioning=gradle
81-
ARG GRADLE_VERSION=8.13
77+
ARG GRADLE_VERSION=7.6.2
8278
RUN install-tool gradle
8379

8480
# renovate: datasource=docker depName=golang versioning=docker
85-
ARG GOLANG_VERSION=1.22.2
81+
ARG GOLANG_VERSION=1.24.0
8682
RUN install-tool golang
8783
# A temporary workaround, until it is fixed by renovate
8884
ENV GOSUMDB="sum.golang.org"
@@ -141,10 +137,6 @@ RUN install-tool python
141137
ARG PYTHON_VERSION=3.8.12
142138
RUN install-tool python
143139

144-
# renovate: datasource=github-releases depName=python lookupName=containerbase/python-prebuild
145-
ARG PYTHON_VERSION=3.13.0
146-
RUN install-tool python
147-
148140
# renovate: datasource=github-releases depName=python lookupName=containerbase/python-prebuild
149141
ARG PYTHON_VERSION=3.9.17
150142
RUN install-tool python
@@ -235,7 +227,7 @@ RUN install-tool elixir 1.13.4
235227
# ENV PATH ${USER_HOME}/.rbenv/bin:$PATH
236228

237229
# renovate: datasource=rubygems depName=cocoapods versioning=ruby
238-
ARG COCOAPODS_VERSION=1.11.2
230+
ARG COCOAPODS_VERSION=1.16.2
239231
RUN install-tool cocoapods
240232
RUN adduser cocoapods
241233
USER cocoapods
@@ -313,15 +305,36 @@ RUN apt-get update && \
313305

314306

315307
#### Install R and Packrat
316-
RUN apt-get update && \
317-
apt-get install -y r-base libopenblas-dev r-base gdebi && \
318-
wget https://download2.rstudio.org/server/bionic/amd64/rstudio-server-2021.09.1-372-amd64.deb && \
319-
gdebi rstudio-server-2021.09.1-372-amd64.deb && \
320-
rm rstudio-server-2021.09.1-372-amd64.deb && \
321-
R -e 'install.packages("packrat" , repos="http://cran.us.r-project.org");' && \
322-
apt-get clean && \
323-
rm -rf /var/lib/apt/lists/* && \
324-
rm -rf /tmp/*
308+
# Set environment variables to avoid interactive prompts
309+
ENV DEBIAN_FRONTEND=noninteractive
310+
ENV TZ=UTC
311+
# Update system and install dependencies
312+
RUN apt-get update && apt-get install -y \
313+
software-properties-common \
314+
dirmngr \
315+
lsb-release \
316+
build-essential \
317+
gfortran \
318+
libcurl4-openssl-dev \
319+
libssl-dev \
320+
libxml2-dev \
321+
libfontconfig1-dev \
322+
libharfbuzz-dev \
323+
libfribidi-dev \
324+
libfreetype6-dev \
325+
libpng-dev \
326+
libtiff5-dev \
327+
libjpeg-dev \
328+
git \
329+
&& rm -rf /var/lib/apt/lists/*
330+
# Add CRAN repository and install R
331+
RUN wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | gpg --dearmor -o /usr/share/keyrings/r-project.gpg && \
332+
echo "deb [signed-by=/usr/share/keyrings/r-project.gpg] https://cloud.r-project.org/bin/linux/ubuntu noble-cran40/" | tee -a /etc/apt/sources.list.d/r-project.list && \
333+
apt-get update && \
334+
apt-get install -y r-base r-base-dev && \
335+
rm -rf /var/lib/apt/lists/*
336+
# Install devtools and packrat from R
337+
RUN R -e "install.packages(c('devtools', 'packrat'), repos='https://cloud.r-project.org/')"
325338

326339
#### Install Cabal
327340
RUN apt-get update &&\

0 commit comments

Comments
 (0)