Skip to content

Commit

Permalink
feat: pin Debian dependencies
Browse files Browse the repository at this point in the history
This allows to faster update on security updates of git and other packages.
  • Loading branch information
nijel committed Jan 27, 2025
1 parent b0cfdc3 commit b1f7955
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 4 deletions.
11 changes: 11 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,17 @@
"matchStrings": [
"renovate: datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s+version: (?<currentValue>.*)\\s"
]
},
{
"customType": "regex",
"fileMatch": [
"^Dockerfile$"
],
"matchStrings": [
"#\\s*renovate:\\s*?(release=(?<release>.*?))?\\s*depName=(?<depName>.*?)?\\sENV .*?_VERSION=\"(?<currentValue>.*)\""
],
"registryUrlTemplate": "https://deb.debian.org/debian?{{#if release }}release={{release}}{{else}}suite=stable{{/if}}&components=main,contrib,non-free&binaryArch=amd64",
"datasourceTemplate": "deb"
}
]
}
19 changes: 15 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,17 @@ ENV PYTHONUNBUFFERED=1
# Add virtualenv to path
ENV PATH=/app/venv/bin:/opt/tools/bin:/usr/local/bin:/usr/bin:/bin

# Debian packages pins

# renovate: release=bookworm depName=git
ENV GIT_VERSION=1:2.39.5-0+deb12u2
# renovate: release=bookworm depName=ca-certificates
ENV CA_VERSION=20230311
# renovate: release=bookworm depName=curl
ENV CURL_VERSION=7.88.1-10+deb12u8
# renovate: release=bookworm depName=openssh-client
ENV OPENSSH_VERSION=1:9.2p1-2+deb12u4

# Install dependencies
# hadolint ignore=DL3008,DL3013,SC2046,DL3003
RUN \
Expand All @@ -55,16 +66,16 @@ RUN \
&& apt-get install --no-install-recommends -y \
nginx-light \
ruby-licensee \
openssh-client \
ca-certificates \
curl \
openssh-client="${OPENSSH_VERSION}" \
ca-certificates="${CA_VERSION}" \
curl="${CURL_VERSION}" \
gir1.2-pango-1.0 \
gir1.2-rsvg-2.0 \
libxmlsec1-openssl \
libjpeg62-turbo \
libmariadb3 \
gettext \
git \
git="${GIT_VERSION}" \
git-svn \
gnupg \
subversion \
Expand Down

0 comments on commit b1f7955

Please sign in to comment.