Skip to content

Commit f52e15f

Browse files
oktalzGopher Bot
authored andcommitted
BUILD/MINOR: ci: update images used in CI
1 parent 08085e9 commit f52e15f

1 file changed

Lines changed: 15 additions & 13 deletions

File tree

.gitlab-ci.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
variables:
33
DOCKER_HOST: tcp://docker:2375
44
GO_VERSION: "1.25"
5-
DOCKER_VERSION: "26.0"
5+
DOCKER_VERSION: "29.1"
66
stages:
77
- bots
88
- check-commit
@@ -15,7 +15,7 @@ pipelines-check:
1515
stage: bots
1616
needs: []
1717
image:
18-
name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-go$GO_VERSION
18+
name: $CI_REGISTRY_GO/golang:latest-alpine
1919
entrypoint: [""]
2020
rules:
2121
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
@@ -27,7 +27,7 @@ mr-backport-question:
2727
stage: bots
2828
needs: []
2929
image:
30-
name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-go$GO_VERSION
30+
name: $CI_REGISTRY_GO/golang:latest-alpine
3131
entrypoint: [""]
3232
rules:
3333
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
@@ -39,7 +39,7 @@ build-specification:
3939
stage: build
4040
needs: []
4141
image:
42-
name: $CI_REGISTRY_GO/golang:$GO_VERSION
42+
name: $CI_REGISTRY_GO/golang:latest-alpine
4343
entrypoint: [""]
4444
tags:
4545
- go
@@ -70,7 +70,7 @@ yaml-lint:
7070
generate:
7171
stage: generate
7272
image:
73-
name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-go$GO_VERSION
73+
name: $CI_REGISTRY_GO/golang:latest-alpine
7474
entrypoint: [""]
7575
services:
7676
- name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-dind
@@ -96,6 +96,9 @@ generate:
9696

9797
build:
9898
stage: build
99+
image:
100+
name: $CI_REGISTRY_GO/golang:latest-alpine
101+
entrypoint: [""]
99102
needs: []
100103
tags:
101104
- go
@@ -111,7 +114,7 @@ tidy:
111114
stage: lint
112115
needs: ["build"]
113116
image:
114-
name: $CI_REGISTRY_GO/golang:$GO_VERSION
117+
name: $CI_REGISTRY_GO/golang:$GO_VERSION-alpine
115118
entrypoint: [""]
116119
tags:
117120
- go
@@ -126,7 +129,7 @@ lint:
126129
stage: lint
127130
needs: ["build"]
128131
image:
129-
name: $CI_REGISTRY_GO/golang:$GO_VERSION
132+
name: $CI_REGISTRY_GO/golang:$GO_VERSION-alpine
130133
entrypoint: [""]
131134
tags:
132135
- go
@@ -140,12 +143,11 @@ license-check:
140143
stage: lint
141144
needs: ["build"]
142145
image:
143-
name: $CI_REGISTRY_GO/golang:$GO_VERSION
146+
name: $CI_REGISTRY_GO/golang:latest-alpine
144147
entrypoint: [""]
145148
tags:
146149
- go
147150
script:
148-
- go install github.com/google/go-licenses@latest
149151
- PROJECT="$(go list -m)"
150152
- ALLOWED_LICENSES="$(<.allowed_license_types)"
151153
- go-licenses report --ignore "$PROJECT" .
@@ -158,7 +160,7 @@ lint-commit-msg:
158160
stage: lint
159161
needs: ["build"]
160162
image:
161-
name: $CI_REGISTRY_GO/commit-check:5.2.0
163+
name: $CI_REGISTRY_GO/commit-check:latest
162164
entrypoint: [""]
163165
tags:
164166
- go
@@ -171,7 +173,7 @@ test:
171173
stage: test
172174
needs: ["build"]
173175
image:
174-
name: $CI_REGISTRY_GO/golang:$GO_VERSION
176+
name: $CI_REGISTRY_GO/golang:latest-alpine
175177
entrypoint: [""]
176178
tags:
177179
- go
@@ -185,7 +187,7 @@ test-equal:
185187
stage: test
186188
needs: ["build"]
187189
image:
188-
name: $CI_REGISTRY_GO/golang:$GO_VERSION
190+
name: $CI_REGISTRY_GO/golang:latest-alpine
189191
entrypoint: [""]
190192
tags:
191193
- go
@@ -209,7 +211,7 @@ test-equal:
209211
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
210212
- if: $CI_PIPELINE_SOURCE == 'push'
211213
before_script:
212-
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY_GO
214+
- docker login -u='$app' -p $CI_REGISTRY_TOKEN $CI_REGISTRY_GO
213215
- docker pull -q $CI_REGISTRY_GO/golang:$GO_VERSION-alpine
214216
- docker image tag $CI_REGISTRY_GO/golang:$GO_VERSION-alpine golang:$GO_VERSION-alpine
215217
- docker pull -q $CI_REGISTRY_GO/haproxy-alpine:$HAPROXY_VERSION

0 commit comments

Comments
 (0)