Skip to content
This repository was archived by the owner on Aug 29, 2023. It is now read-only.

Commit e740a7b

Browse files
committed
fix: normalize version variable in buildx download url
1 parent d32a1ee commit e740a7b

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

.drone.jsonnet

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@ local PipelineBuildBinaries = {
8787
commands: [
8888
'[ -z "${DRONE_TAG}" ] && BUILD_VERSION=${DRONE_COMMIT_SHA:0:8} || BUILD_VERSION=${DRONE_TAG##v}',
8989
'mkdir -p release/',
90-
"cd cmd/drone-docker-buildx && xgo -ldflags \"-s -w -X main.version=$BUILD_VERSION\" -tags netgo -targets 'linux/amd64,linux/arm-6,linux/arm64' -out drone-docker-buildx .",
90+
"cd cmd/drone-docker-buildx && xgo -ldflags \"-s -w -X main.version=$BUILD_VERSION\" -tags netgo -targets 'linux/amd64,linux/arm-6,linux/arm-7,linux/arm64' -out drone-docker-buildx .",
9191
'mv /build/* /drone/src/release/',
92+
'ls -l /drone/src/release/'
9293
],
9394
},
9495
{

docker/Dockerfile.amd64

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ ARG BUILDX_VERSION
1111

1212
# renovate: datasource=github-releases depName=docker/buildx
1313
ENV BUILDX_VERSION="${BUILDX_VERSION:-v0.5.1}"
14+
1415
ENV DOCKER_HOST=unix:///var/run/docker.sock
1516

1617
RUN apk --update add --virtual .build-deps curl && \
1718
mkdir -p /usr/lib/docker/cli-plugins/ && \
18-
curl -SsL -o /usr/lib/docker/cli-plugins/docker-buildx "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-amd64" && \
19+
curl -SsL -o /usr/lib/docker/cli-plugins/docker-buildx "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION##v}/buildx-v${BUILDX_VERSION##v}.linux-amd64" && \
1920
chmod 755 /usr/lib/docker/cli-plugins/docker-buildx && \
2021
apk del .build-deps && \
2122
rm -rf /var/cache/apk/* && \

docker/Dockerfile.arm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ ARG BUILDX_VERSION
1111

1212
# renovate: datasource=github-releases depName=docker/buildx
1313
ENV BUILDX_VERSION="${BUILDX_VERSION:-v0.5.1}"
14+
1415
ENV DOCKER_HOST=unix:///var/run/docker.sock
1516

1617
RUN apk --update add --virtual .build-deps curl && \
1718
mkdir -p /usr/lib/docker/cli-plugins/ && \
18-
curl -SsL -o /usr/lib/docker/cli-plugins/docker-buildx "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-arm-v7" && \
19+
curl -SsL -o /usr/lib/docker/cli-plugins/docker-buildx "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION##v}/buildx-v${BUILDX_VERSION##v}.linux-arm-v7" && \
1920
chmod 755 /usr/lib/docker/cli-plugins/docker-buildx && \
2021
apk del .build-deps && \
2122
rm -rf /var/cache/apk/* && \

docker/Dockerfile.arm64

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ ARG BUILDX_VERSION
1111

1212
# renovate: datasource=github-releases depName=docker/buildx
1313
ENV BUILDX_VERSION="${BUILDX_VERSION:-v0.5.1}"
14+
1415
ENV DOCKER_HOST=unix:///var/run/docker.sock
1516

1617
RUN apk --update add --virtual .build-deps curl && \
1718
mkdir -p /usr/lib/docker/cli-plugins/ && \
18-
curl -SsL -o /usr/lib/docker/cli-plugins/docker-buildx "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-arm64" && \
19+
curl -SsL -o /usr/lib/docker/cli-plugins/docker-buildx "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION##v}/buildx-v${BUILDX_VERSION##v}.linux-arm64" && \
1920
chmod 755 /usr/lib/docker/cli-plugins/docker-buildx && \
2021
apk del .build-deps && \
2122
rm -rf /var/cache/apk/* && \

0 commit comments

Comments
 (0)