Skip to content

Commit d9549f5

Browse files
authored
Merge pull request #42 from drone-plugins/CI-14990
Fix: [CI: 14990] : Updated docker image version to 27.3.1-dind
2 parents 8b1e82b + 2084d86 commit d9549f5

File tree

5 files changed

+24
-23
lines changed

5 files changed

+24
-23
lines changed

.drone.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ platform:
1212

1313
steps:
1414
- name: vet
15-
image: golang:1.20
15+
image: golang:1.22
1616
commands:
1717
- go vet ./...
1818
environment:
@@ -22,7 +22,7 @@ steps:
2222
path: /go
2323

2424
- name: test
25-
image: golang:1.20
25+
image: golang:1.22
2626
commands:
2727
- go test -cover ./...
2828
environment:
@@ -55,7 +55,7 @@ platform:
5555

5656
steps:
5757
- name: go build
58-
image: golang:1.17
58+
image: golang:1.22
5959
environment:
6060
CGO_ENABLED: 0
6161
commands:
@@ -98,7 +98,7 @@ platform:
9898

9999
steps:
100100
- name: go build
101-
image: golang:1.17
101+
image: golang:1.22
102102
environment:
103103
CGO_ENABLED: 0
104104
commands:
@@ -141,7 +141,7 @@ platform:
141141

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

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

164164
- name: executable
165-
image: golang:1.17
165+
image: golang:1.22
166166
commands:
167167
- ./release/linux/amd64/drone-docker --help
168168

@@ -206,7 +206,7 @@ platform:
206206

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

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

229229
- name: executable
230-
image: golang:1.17
230+
image: golang:1.22
231231
commands:
232232
- ./release/linux/arm64/drone-docker --help
233233

@@ -306,7 +306,7 @@ platform:
306306

307307
steps:
308308
- name: build-push
309-
image: golang:1.17
309+
image: golang:1.22
310310
commands:
311311
- 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/amd64/drone-heroku ./cmd/drone-heroku'
312312
environment:
@@ -316,7 +316,7 @@ steps:
316316
exclude:
317317
- tag
318318
- name: build-tag
319-
image: golang:1.17
319+
image: golang:1.22
320320
commands:
321321
- 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/amd64/drone-heroku ./cmd/drone-heroku'
322322
environment:
@@ -365,7 +365,7 @@ platform:
365365

366366
steps:
367367
- name: build-push
368-
image: golang:1.17
368+
image: golang:1.22
369369
commands:
370370
- 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/arm64/drone-heroku ./cmd/drone-heroku'
371371
environment:
@@ -375,7 +375,7 @@ steps:
375375
exclude:
376376
- tag
377377
- name: build-tag
378-
image: golang:1.17
378+
image: golang:1.22
379379
commands:
380380
- 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/arm64/drone-heroku ./cmd/drone-heroku'
381381
environment:
@@ -454,7 +454,7 @@ pool:
454454
steps:
455455
- name: build
456456
pull: always
457-
image: golang:1.19
457+
image: golang:1.22
458458
commands:
459459
- GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -a -tags netgo -o release/drone-buildx-linux-amd64 ./cmd/drone-docker
460460
- GOOS=linux GOARCH=arm64 go build -ldflags "-s -w" -a -tags netgo -o release/drone-buildx-linux-arm64 ./cmd/drone-docker

docker/docker/Dockerfile.linux.amd64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM docker:20.10.14-dind
1+
FROM docker:27.3.1-dind
22

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

55
ENV DOCKER_BUILDKIT=1
66
ENV BUILDKIT_PROGRESS=plain
77
ENV DOCKER_CLI_EXPERIMENTAL=enabled
88

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

1111
RUN mkdir -p $HOME/.docker/cli-plugins && \
1212
wget -O $HOME/.docker/cli-plugins/docker-buildx $BUILDX_URL && \

docker/docker/Dockerfile.linux.arm64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM arm64v8/docker:20.10.14-dind
1+
FROM arm64v8/docker:27.3.1-dind
22

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

55
ENV DOCKER_BUILDKIT=1
66
ENV BUILDKIT_PROGRESS=plain
77
ENV DOCKER_CLI_EXPERIMENTAL=enabled
88

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

1111
RUN mkdir -p $HOME/.docker/cli-plugins && \
1212
wget -O $HOME/.docker/cli-plugins/docker-buildx $BUILDX_URL && \

docker/docker/Dockerfile.windows.amd64.1809

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# escape=`
2-
# using 1809-KB5021237-amd64 as base image, 1809-KB5022286-amd64 does not work
3-
FROM mcr.microsoft.com/windows/servercore:1809-KB5021237 as download
2+
FROM mcr.microsoft.com/windows/servercore:ltsc2019 as download
43

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

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

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

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

1919
USER ContainerAdministrator
2020

@@ -27,4 +27,5 @@ RUN mkdir C:\bin
2727
COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll
2828
COPY --from=download /app/docker.exe C:/bin/docker.exe
2929
ADD release/windows/amd64/drone-docker.exe C:/bin/drone-docker.exe
30+
3031
ENTRYPOINT [ "C:\\bin\\drone-docker.exe" ]

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ require (
2424
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
2525
)
2626

27-
go 1.20
27+
go 1.22

0 commit comments

Comments
 (0)