Skip to content

Commit d70dcec

Browse files
strophyrvolosatovs
authored andcommitted
chore: pin xx image version and update xx command
1 parent 90d207d commit d70dcec

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

.github/renovate.json

+7
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,13 @@
176176
"matchStrings": ["UPX_VERSION=(?<currentValue>.*?)\\n"],
177177
"depNameTemplate": "upx/upx",
178178
"datasourceTemplate": "github-releases"
179+
},
180+
{
181+
"fileMatch": ["^deps\\.list$"],
182+
"matchStrings": ["XX_IMAGE_VERSION=(?<currentValue>.*?)\\n"],
183+
"depNameTemplate": "tonistiigi/xx",
184+
"datasourceTemplate": "docker",
185+
"versioningTemplate": "docker"
179186
}
180187
]
181188
}

.github/workflows/dockerimage.yml

+1
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,4 @@ jobs:
9292
SCALA_SBT_IMAGE_VERSION=${{ env.SCALA_SBT_IMAGE_VERSION }}
9393
SWIFT_IMAGE_VERSION=${{ env.SWIFT_IMAGE_VERSION }}
9494
UPX_VERSION=${{ env.UPX_VERSION }}
95+
XX_IMAGE_VERSION=${{ env.XX_IMAGE_VERSION }}

Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ ARG NODE_IMAGE_VERSION
77
ARG RUST_IMAGE_VERSION
88
ARG SCALA_SBT_IMAGE_VERSION
99
ARG SWIFT_IMAGE_VERSION
10+
ARG XX_IMAGE_VERSION
1011

1112

12-
FROM --platform=$BUILDPLATFORM tonistiigi/xx:master AS xx
13+
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_IMAGE_VERSION} AS xx
1314

1415

1516
FROM --platform=$BUILDPLATFORM golang:${GO_IMAGE_VERSION} as go_host
@@ -223,7 +224,7 @@ RUN --mount=type=cache,target=/root/.cargo/git/db \
223224
cargo fetch
224225
ARG TARGETPLATFORM
225226
RUN xx-cargo --config profile.release.strip=true build --release
226-
RUN install -D /rust-protobuf/target/$(xx-cargo --print-target)/release/protoc-gen-rust /out/usr/bin/protoc-gen-rust
227+
RUN install -D /rust-protobuf/target/$(xx-cargo --print-target-triple)/release/protoc-gen-rust /out/usr/bin/protoc-gen-rust
227228
RUN xx-verify /out/usr/bin/protoc-gen-rust
228229

229230

@@ -238,7 +239,7 @@ RUN --mount=type=cache,target=/root/.cargo/git/db \
238239
cargo fetch
239240
ARG TARGETPLATFORM
240241
RUN xx-cargo --config profile.release.strip=true build --release
241-
RUN install -D /grpc-rust/target/$(xx-cargo --print-target)/release/protoc-gen-rust-grpc /out/usr/bin/protoc-gen-rust-grpc
242+
RUN install -D /grpc-rust/target/$(xx-cargo --print-target-triple)/release/protoc-gen-rust-grpc /out/usr/bin/protoc-gen-rust-grpc
242243
RUN xx-verify /out/usr/bin/protoc-gen-rust-grpc
243244

244245

deps.list

+1
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ RUST_IMAGE_VERSION=1.66.1-alpine3.16
2626
SCALA_SBT_IMAGE_VERSION=graalvm-ce-21.3.0-java17_1.8.0_3.2.1
2727
SWIFT_IMAGE_VERSION=5.7-focal
2828
UPX_VERSION=4.0.1
29+
XX_IMAGE_VERSION=1.2.0

0 commit comments

Comments
 (0)