Skip to content

Commit b9ab211

Browse files
authored
Renovate: stop trying to inject shasums into Dockerfiles (#2994)
1 parent 610e9da commit b9ab211

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.buildkite/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG NODE_VERSION=${NODE_VERSION:-20}
2-
FROM node:latest@sha256:dc4ac80350904c2797058e477a30b6285e9e025f23f139ea8b277c9efe55dd9a:$NODE_VERSION
1+
ARG NODE_VERSION=${NODE_VERSION:-22}
2+
FROM node:$NODE_VERSION
33

44
# Install required tools
55
RUN apt-get clean -y && \

.buildkite/Dockerfile-make

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG NODE_JS_VERSION=${NODE_JS_VERSION:-20}
2-
FROM node:latest@sha256:dc4ac80350904c2797058e477a30b6285e9e025f23f139ea8b277c9efe55dd9a:${NODE_JS_VERSION}
1+
ARG NODE_VERSION=${NODE_VERSION:-22}
2+
FROM node:$NODE_VERSION
33

44
ARG BUILDER_UID=1000
55
ARG BUILDER_GID=1000

.github/make.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ product="elastic/elasticsearch-js"
3737
output_folder=".buildkite/output"
3838
codegen_folder=".buildkite/output"
3939
OUTPUT_DIR="$repo/${output_folder}"
40-
NODE_JS_VERSION=22
40+
NODE_VERSION=22
4141
WORKFLOW=${WORKFLOW-staging}
4242
mkdir -p "$OUTPUT_DIR"
4343

@@ -133,7 +133,7 @@ echo -e "\033[34;1mINFO: building $product container\033[0m"
133133
docker build \
134134
--file .buildkite/Dockerfile-make \
135135
--tag "$product" \
136-
--build-arg NODE_JS_VERSION="$NODE_JS_VERSION" \
136+
--build-arg NODE_VERSION="$NODE_VERSION" \
137137
--build-arg "BUILDER_UID=$(id -u)" \
138138
--build-arg "BUILDER_GID=$(id -g)" \
139139
.

renovate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"packageRules": [
1414
{
1515
"matchManagers": [
16-
"dockerfile"
16+
"dockerfile",
17+
"docker"
1718
],
1819
"pinDigests": false
1920
},

0 commit comments

Comments
 (0)