Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ platform:

steps:
- name: vet
image: golang:1.20
image: golang:1.22
commands:
- go vet ./...
environment:
Expand All @@ -22,7 +22,7 @@ steps:
path: /go

- name: test
image: golang:1.20
image: golang:1.22
commands:
- go test -cover ./...
environment:
Expand Down Expand Up @@ -55,7 +55,7 @@ platform:

steps:
- name: go build
image: golang:1.17
image: golang:1.22
environment:
CGO_ENABLED: 0
commands:
Expand Down Expand Up @@ -98,7 +98,7 @@ platform:

steps:
- name: go build
image: golang:1.17
image: golang:1.22
environment:
CGO_ENABLED: 0
commands:
Expand Down Expand Up @@ -141,7 +141,7 @@ platform:

steps:
- name: build-push
image: golang:1.17
image: golang:1.22
commands:
- 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/amd64/drone-docker ./cmd/drone-docker'
environment:
Expand All @@ -152,7 +152,7 @@ steps:
- tag

- name: build-tag
image: golang:1.17
image: golang:1.22
commands:
- 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/amd64/drone-docker ./cmd/drone-docker'
environment:
Expand All @@ -162,7 +162,7 @@ steps:
- tag

- name: executable
image: golang:1.17
image: golang:1.22
commands:
- ./release/linux/amd64/drone-docker --help

Expand Down Expand Up @@ -206,7 +206,7 @@ platform:

steps:
- name: build-push
image: golang:1.17
image: golang:1.22
commands:
- 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/arm64/drone-docker ./cmd/drone-docker'
environment:
Expand All @@ -217,7 +217,7 @@ steps:
- tag

- name: build-tag
image: golang:1.17
image: golang:1.22
commands:
- 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/arm64/drone-docker ./cmd/drone-docker'
environment:
Expand All @@ -227,7 +227,7 @@ steps:
- tag

- name: executable
image: golang:1.17
image: golang:1.22
commands:
- ./release/linux/arm64/drone-docker --help

Expand Down Expand Up @@ -306,7 +306,7 @@ platform:

steps:
- name: build-push
image: golang:1.17
image: golang:1.22
commands:
- 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/amd64/drone-heroku ./cmd/drone-heroku'
environment:
Expand All @@ -316,7 +316,7 @@ steps:
exclude:
- tag
- name: build-tag
image: golang:1.17
image: golang:1.22
commands:
- 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/amd64/drone-heroku ./cmd/drone-heroku'
environment:
Expand Down Expand Up @@ -365,7 +365,7 @@ platform:

steps:
- name: build-push
image: golang:1.17
image: golang:1.22
commands:
- 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/arm64/drone-heroku ./cmd/drone-heroku'
environment:
Expand All @@ -375,7 +375,7 @@ steps:
exclude:
- tag
- name: build-tag
image: golang:1.17
image: golang:1.22
commands:
- 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/arm64/drone-heroku ./cmd/drone-heroku'
environment:
Expand Down Expand Up @@ -454,7 +454,7 @@ pool:
steps:
- name: build
pull: always
image: golang:1.19
image: golang:1.22
commands:
- GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -a -tags netgo -o release/drone-buildx-linux-amd64 ./cmd/drone-docker
- GOOS=linux GOARCH=arm64 go build -ldflags "-s -w" -a -tags netgo -o release/drone-buildx-linux-arm64 ./cmd/drone-docker
Expand Down
4 changes: 2 additions & 2 deletions docker/docker/Dockerfile.linux.amd64
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM docker:20.10.14-dind
FROM docker:27.3.1-dind

ENV DOCKER_HOST=unix:///var/run/docker.sock

ENV DOCKER_BUILDKIT=1
ENV BUILDKIT_PROGRESS=plain
ENV DOCKER_CLI_EXPERIMENTAL=enabled

ARG BUILDX_URL=https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-amd64
ARG BUILDX_URL=https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-amd64

RUN mkdir -p $HOME/.docker/cli-plugins && \
wget -O $HOME/.docker/cli-plugins/docker-buildx $BUILDX_URL && \
Expand Down
4 changes: 2 additions & 2 deletions docker/docker/Dockerfile.linux.arm64
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM arm64v8/docker:20.10.14-dind
FROM arm64v8/docker:27.3.1-dind

ENV DOCKER_HOST=unix:///var/run/docker.sock

ENV DOCKER_BUILDKIT=1
ENV BUILDKIT_PROGRESS=plain
ENV DOCKER_CLI_EXPERIMENTAL=enabled

ARG BUILDX_URL=https://github.com/docker/buildx/releases/download/v0.14.1/buildx-v0.14.1.linux-arm64
ARG BUILDX_URL=https://github.com/docker/buildx/releases/download/v0.18.0/buildx-v0.18.0.linux-arm64

RUN mkdir -p $HOME/.docker/cli-plugins && \
wget -O $HOME/.docker/cli-plugins/docker-buildx $BUILDX_URL && \
Expand Down
7 changes: 4 additions & 3 deletions docker/docker/Dockerfile.windows.amd64.1809
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# escape=`
# using 1809-KB5021237-amd64 as base image, 1809-KB5022286-amd64 does not work
FROM mcr.microsoft.com/windows/servercore:1809-KB5021237 as download
FROM mcr.microsoft.com/windows/servercore:ltsc2019 as download

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand All @@ -10,11 +9,12 @@ RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.6-wi
Expand-Archive innoextract.zip -DestinationPath C:\ ; `
Remove-Item -Path innoextract.zip

# Download Docker Toolbox
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing
RUN /innoextract.exe dockertoolbox.exe

FROM mcr.microsoft.com/windows/nanoserver:1809-KB5021237-amd64
FROM mcr.microsoft.com/windows/nanoserver:ltsc2019

USER ContainerAdministrator

Expand All @@ -27,4 +27,5 @@ RUN mkdir C:\bin
COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll
COPY --from=download /app/docker.exe C:/bin/docker.exe
ADD release/windows/amd64/drone-docker.exe C:/bin/drone-docker.exe

ENTRYPOINT [ "C:\\bin\\drone-docker.exe" ]
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ require (
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

go 1.20
go 1.22