Skip to content

Commit b00f42e

Browse files
oktalzGopher Bot
authored andcommitted
BUILD/MINOR: ci: update images used in CI
1 parent 760c4b7 commit b00f42e

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

.gitlab-ci.yml

Lines changed: 14 additions & 12 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 @@ build-specification:
2727
stage: build
2828
needs: []
2929
image:
30-
name: $CI_REGISTRY_GO/golang:$GO_VERSION
30+
name: $CI_REGISTRY_GO/golang:latest-alpine
3131
entrypoint: [""]
3232
tags:
3333
- go
@@ -58,7 +58,7 @@ yaml-lint:
5858
generate:
5959
stage: generate
6060
image:
61-
name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-go$GO_VERSION
61+
name: $CI_REGISTRY_GO/golang:latest-alpine
6262
entrypoint: [""]
6363
services:
6464
- name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-dind
@@ -77,6 +77,9 @@ generate:
7777

7878
build:
7979
stage: build
80+
image:
81+
name: $CI_REGISTRY_GO/golang:latest-alpine
82+
entrypoint: [""]
8083
needs: []
8184
tags:
8285
- go
@@ -92,7 +95,7 @@ tidy:
9295
stage: lint
9396
needs: ["build"]
9497
image:
95-
name: $CI_REGISTRY_GO/golang:$GO_VERSION
98+
name: $CI_REGISTRY_GO/golang:$GO_VERSION-alpine
9699
entrypoint: [""]
97100
tags:
98101
- go
@@ -107,7 +110,7 @@ lint:
107110
stage: lint
108111
needs: ["build"]
109112
image:
110-
name: $CI_REGISTRY_GO/golang:$GO_VERSION
113+
name: $CI_REGISTRY_GO/golang:$GO_VERSION-alpine
111114
entrypoint: [""]
112115
tags:
113116
- go
@@ -121,12 +124,11 @@ license-check:
121124
stage: lint
122125
needs: ["build"]
123126
image:
124-
name: $CI_REGISTRY_GO/golang:$GO_VERSION
127+
name: $CI_REGISTRY_GO/golang:latest-alpine
125128
entrypoint: [""]
126129
tags:
127130
- go
128131
script:
129-
- go install github.com/google/go-licenses@latest
130132
- PROJECT="$(go list -m)"
131133
- ALLOWED_LICENSES="$(<.allowed_license_types)"
132134
- go-licenses report --ignore "$PROJECT" .
@@ -139,7 +141,7 @@ lint-commit-msg:
139141
stage: lint
140142
needs: ["build"]
141143
image:
142-
name: $CI_REGISTRY_GO/check-commit:v2.1.0
144+
name: $CI_REGISTRY_GO/commit-check:latest
143145
entrypoint: [""]
144146
tags:
145147
- go
@@ -152,7 +154,7 @@ test:
152154
stage: test
153155
needs: ["build"]
154156
image:
155-
name: $CI_REGISTRY_GO/golang:$GO_VERSION
157+
name: $CI_REGISTRY_GO/golang:latest-alpine
156158
entrypoint: [""]
157159
tags:
158160
- go
@@ -166,7 +168,7 @@ test-equal:
166168
stage: test
167169
needs: ["build"]
168170
image:
169-
name: $CI_REGISTRY_GO/golang:$GO_VERSION
171+
name: $CI_REGISTRY_GO/golang:latest-alpine
170172
entrypoint: [""]
171173
tags:
172174
- go
@@ -190,7 +192,7 @@ test-equal:
190192
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
191193
- if: $CI_PIPELINE_SOURCE == 'push'
192194
before_script:
193-
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY_GO
195+
- docker login -u='$app' -p $CI_REGISTRY_TOKEN $CI_REGISTRY_GO
194196
- docker pull -q $CI_REGISTRY_GO/golang:$GO_VERSION-alpine
195197
- docker image tag $CI_REGISTRY_GO/golang:$GO_VERSION-alpine golang:$GO_VERSION-alpine
196198
- docker pull -q $CI_REGISTRY_GO/haproxy-alpine:$HAPROXY_VERSION

0 commit comments

Comments
 (0)