Skip to content

Commit 3b443d4

Browse files
nicholasdillenicholasdille
committed
Final updae after 20250514
1 parent 27f4a84 commit 3b443d4

File tree

21 files changed

+166
-76
lines changed

21 files changed

+166
-76
lines changed

‎160_gitlab_ci/000_rollout/README.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Rollout of 160_gitlab_ci
22

3+
## Preparation
4+
5+
1. Set a timestamp for the event (`YYYY-mm-dd`)
6+
1. Update links from slides to exercises using regex `/hands-on/\d{4}-\d{2}-\d{2}/`
7+
1. Update syntax definitions for `Dockerfile` using regex: `docker/dockerfile:\d+.\d+.\d+`
8+
1. Update nginx using regex: `nginx:\d+.\d+.\d+`
9+
1. Update traefik using regex: `traefik:v\d+.\d+.\d+`
10+
1. Update GitLab using regex: `gitlab/gitlab-ce:\d+.\d+.\d+-ce.0`
11+
1. Update GitLab Runner using regex: `gitlab/gitlab-runner:v\d+.\d+.\d+`
12+
1. Update code-server using regex: `codercom/code-server:\d+.\d+.\d+`
13+
1. Update golang using regex: `golang:\d+.\d+.\d+`
14+
1. Update curl using regex: `curlimages/curl:\d+.\d+.\d+`
15+
1. Update docker using regex: `docker:\d+.\d+.\d+(-dind)?` with replacement `docker:28.1.1$1`
16+
1. Update ubuntu using regex: `ubuntu:\d+.\d+`
17+
1. Update release-cli using regex: `registry.gitlab.com/gitlab-org/release-cli:v\d+\.\d+\.\d+`
18+
1. Update versions in `160_gitlab_ci/000_rollout/gitlab.pkr.hcl` for pre-pulling container images
19+
320
## Prerequisites
421

522
```shell

‎160_gitlab_ci/001_server/nginx/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#syntax=docker/dockerfile:1.15.1
1+
#syntax=docker/dockerfile:1.16.0
22

33
FROM nginx:1.27.5
44

‎160_gitlab_ci/002_runner/runner/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#syntax=docker/dockerfile:1.15.1
1+
#syntax=docker/dockerfile:1.16.0
22

33
FROM gitlab/gitlab-runner:v17.11.1
44

‎160_gitlab_ci/003_vscode/vscode/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#syntax=docker/dockerfile:1.15.1
1+
#syntax=docker/dockerfile:1.16.0
22

33
FROM codercom/code-server:4.99.4
44
USER root

‎160_gitlab_ci/110_triggers/example2.drawio.svg‎

Lines changed: 28 additions & 3 deletions
Loading

‎160_gitlab_ci/150_matrix_jobs/exercise.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ Improve the template `.build-go` in `go.yaml` to build for `linux/amd64` and `li
2626

2727
Afterwards check the pipeline in the GitLab UI. You should see a successful pipeline run.
2828

29+
??? info "Hint (Click if you are stuck)"
30+
Matrix pipelines require the `parallel:matrix` keyword.
31+
2932
??? example "Solution (Click if you are stuck)"
3033
`go.yaml`:
3134

‎160_gitlab_ci/220_services/exercise.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
Service are launched in parallel to the regular job to add missing functionality, e.g. a database backend to execute integration tests. See the [official documentation](https://docs.gitlab.com/ee/ci/yaml/#services) and modify the pipeline:
1212

13-
1. Create service for the whole pipeline based on the container image `nginx:1.20.2`
13+
1. Create service for the whole pipeline based on the container image `nginx:1.27.5`
1414
1. Add a new job `test-service` to the stage `test` with the following code:
1515
```bash
1616
curl -s http://nginx
@@ -24,7 +24,7 @@ Afterwards check the pipeline in the GitLab UI. You should see a successful pipe
2424

2525
```yaml
2626
services:
27-
- nginx:1.20.2
27+
- nginx:1.27.5
2828
```
2929

3030
??? example "Solution (Click if you are stuck)"
@@ -67,7 +67,7 @@ Afterwards check the pipeline in the GitLab UI. You should see a successful pipe
6767
image: golang:1.24.3
6868
6969
services:
70-
- nginx:1.20.2
70+
- nginx:1.27.5
7171
7272
lint:
7373
stage: check
@@ -230,7 +230,7 @@ Afterwards check the pipeline in the GitLab UI. You should see a successful pipe
230230
extends:
231231
- .run-on-push-to-default-branch
232232
services:
233-
- nginx:1.20.2
233+
- nginx:1.27.5
234234
script:
235235
- curl -s http://nginx
236236

‎160_gitlab_ci/230_docker/exercise.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ For building a container image, you will need to...
2020

2121
1. Add a new stage `package` to the pipeline
2222
1. Add a new job `package` to the pipeline
23-
1. Use the image `docker:27.3.1` for the job
23+
1. Use the image `docker:28.1.1` for the job
2424
1. Add a rule to limit execution to pushes to the default branch
25-
1. Add a service to the job using the image `docker:27.3.1-dind`
25+
1. Add a service to the job using the image `docker:28.1.1-dind`
2626
1. Add a variable `DOCKER_TLS_CERTDIR` to the job and set it to an empty string
2727
1. Execute the command `docker build --tag hello .`
2828

@@ -38,7 +38,7 @@ Afterwards check the pipeline in the GitLab UI. You should see a successful pipe
3838
variables:
3939
DOCKER_TLS_CERTDIR: ""
4040
services:
41-
- name: docker:27.3.1-dind
41+
- name: docker:28.1.1-dind
4242
```
4343

4444
??? example "Solution (Click if you are stuck)"
@@ -146,14 +146,14 @@ Afterwards check the pipeline in the GitLab UI. You should see a successful pipe
146146
- public
147147

148148
package:
149-
image: docker:27.3.1
149+
image: docker:28.1.1
150150
stage: package
151151
rules:
152152
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH'
153153
variables:
154154
DOCKER_TLS_CERTDIR: ""
155155
services:
156-
- docker:27.3.1-dind
156+
- docker:28.1.1-dind
157157
script:
158158
- docker build --tag hello .
159159

‎160_gitlab_ci/240_registries/exercise.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ Afterwards check the pipeline in the GitLab UI. You should see a successful pipe
132132
- public
133133

134134
package:
135-
image: docker:20.10.18
135+
image: docker:28.1.1
136136
stage: package
137137
extends:
138138
- .run-on-push-to-default-branch
139139
services:
140-
- name: docker:20.10.18-dind
140+
- name: docker:28.1.1-dind
141141
command: [ "dockerd", "--host", "tcp://0.0.0.0:2375" ]
142142
variables:
143143
DOCKER_HOST: tcp://docker:2375

‎160_gitlab_ci/250_releases/exercise.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ GitLab can create [releases](https://docs.gitlab.com/ee/user/project/releases/in
1818

1919
For the `release` keyword to work, the `release-cli` binary must be present in the execution environment of the job:
2020

21-
1. Set `image` to `registry.gitlab.com/gitlab-org/release-cli:v0.14.0`
21+
1. Set `image` to `registry.gitlab.com/gitlab-org/release-cli:v0.23.0`
2222

2323
Afterwards check the pipeline in the GitLab UI. You should see a successful pipeline run.
2424

@@ -132,7 +132,7 @@ Afterwards check the pipeline in the GitLab UI. You should see a successful pipe
132132
stage: deploy
133133
extends:
134134
- .run-on-push-to-default-branch
135-
image: registry.gitlab.com/gitlab-org/release-cli:v0.14.0
135+
image: registry.gitlab.com/gitlab-org/release-cli:v0.23.0
136136
release:
137137
tag_name: ${CI_PIPELINE_IID}
138138
name: Release ${CI_PIPELINE_IID}
@@ -147,12 +147,12 @@ Afterwards check the pipeline in the GitLab UI. You should see a successful pipe
147147
- public
148148

149149
package:
150-
image: docker:20.10.18
150+
image: docker:28.1.1
151151
stage: package
152152
extends:
153153
- .run-on-push-to-default-branch
154154
services:
155-
- name: docker:20.10.18-dind
155+
- name: docker:28.1.1-dind
156156
command: [ "dockerd", "--host", "tcp://0.0.0.0:2375" ]
157157
variables:
158158
DOCKER_HOST: tcp://docker:2375

0 commit comments

Comments
 (0)