Skip to content

engine: dynamic docker-ce version n (latest) and n-1 #21599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2024
Merged

engine: dynamic docker-ce version n (latest) and n-1 #21599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions content/manuals/engine/install/centos.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
```console
$ dnf list docker-ce --showduplicates | sort -r

docker-ce.x86_64 3:27.4.0-1.el9 docker-ce-stable
docker-ce.x86_64 3:27.3.1-1.el9 docker-ce-stable
docker-ce.x86_64 3:{{% param "docker_ce_version" %}}-1.el9 docker-ce-stable
docker-ce.x86_64 3:{{% param "docker_ce_version_prev" %}}-1.el9 docker-ce-stable
<...>
```

Expand All @@ -129,7 +129,7 @@

Install a specific version by its fully qualified package name, which is
the package name (`docker-ce`) plus the version string (2nd column),
separated by a hyphen (`-`). For example, `docker-ce-3:27.4.0-1.el9`.
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}-1.el9`.

Check failure on line 132 in content/manuals/engine/install/centos.md

View workflow job for this annotation

GitHub Actions / vale 

[vale] reported by reviewdog 🐶
[Vale.Spelling] Did you really mean 'param'?

Raw Output:
{"message": "[Vale.Spelling] Did you really mean 'param'?", "location": {"path": "content/manuals/engine/install/centos.md", "range": {"start": {"line": 132, "column": 63}}}, "severity": "ERROR"}

Check failure on line 132 in content/manuals/engine/install/centos.md

View workflow job for this annotation

GitHub Actions / vale 

[vale] reported by reviewdog 🐶
[Vale.Spelling] Did you really mean 'docker_ce_version'?

Raw Output:
{"message": "[Vale.Spelling] Did you really mean 'docker_ce_version'?", "location": {"path": "content/manuals/engine/install/centos.md", "range": {"start": {"line": 132, "column": 70}}}, "severity": "ERROR"}

Replace `<VERSION_STRING>` with the desired version and then run the following
command to install:
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/engine/install/debian.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,15 @@ Docker from the repository.
# List the available versions:
$ apt-cache madison docker-ce | awk '{ print $3 }'

5:27.4.0-1~debian.12~bookworm
5:27.3.1-1~debian.12~bookworm
5:{{% param "docker_ce_version" %}}-1~debian.12~bookworm
5:{{% param "docker_ce_version_prev" %}}-1~debian.12~bookworm
...
```

Select the desired version and install:

```console
$ VERSION_STRING=5:27.4.0-1~debian.12~bookworm
$ VERSION_STRING=5:{{% param "docker_ce_version" %}}-1~debian.12~bookworm
$ sudo apt-get install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
```

Expand Down
6 changes: 3 additions & 3 deletions content/manuals/engine/install/fedora.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@
```console
$ dnf list docker-ce --showduplicates | sort -r

docker-ce.x86_64 3:27.4.0-1.fc41 docker-ce-stable
docker-ce.x86_64 3:27.3.1-1.fc41 docker-ce-stable
docker-ce.x86_64 3:{{% param "docker_ce_version" %}}-1.fc41 docker-ce-stable
docker-ce.x86_64 3:{{% param "docker_ce_version_prev" %}}-1.fc41 docker-ce-stable
<...>
```

Expand All @@ -126,7 +126,7 @@

Install a specific version by its fully qualified package name, which is
the package name (`docker-ce`) plus the version string (2nd column),
separated by a hyphen (`-`). For example, `docker-ce-3:27.4.0-1.fc41`.
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}-1.fc41`.

Check failure on line 129 in content/manuals/engine/install/fedora.md

View workflow job for this annotation

GitHub Actions / vale 

[vale] reported by reviewdog 🐶
[Vale.Spelling] Did you really mean 'param'?

Raw Output:
{"message": "[Vale.Spelling] Did you really mean 'param'?", "location": {"path": "content/manuals/engine/install/fedora.md", "range": {"start": {"line": 129, "column": 63}}}, "severity": "ERROR"}

Check failure on line 129 in content/manuals/engine/install/fedora.md

View workflow job for this annotation

GitHub Actions / vale 

[vale] reported by reviewdog 🐶
[Vale.Spelling] Did you really mean 'docker_ce_version'?

Raw Output:
{"message": "[Vale.Spelling] Did you really mean 'docker_ce_version'?", "location": {"path": "content/manuals/engine/install/fedora.md", "range": {"start": {"line": 129, "column": 70}}}, "severity": "ERROR"}

Replace `<VERSION_STRING>` with the desired version and then run the following
command to install:
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/engine/install/raspberry-pi-os.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@ Docker from the repository.
# List the available versions:
$ apt-cache madison docker-ce | awk '{ print $3 }'

5:27.4.0-1~raspbian.12~bookworm
5:27.3.1-1~raspbian.12~bookworm
5:{{% param "docker_ce_version" %}}-1~raspbian.12~bookworm
5:{{% param "docker_ce_version_prev" %}}-1~raspbian.12~bookworm
...
```

Select the desired version and install:

```console
$ VERSION_STRING=5:27.4.0-1~raspbian.12~bookworm
$ VERSION_STRING=5:{{% param "docker_ce_version" %}}-1~raspbian.12~bookworm
$ sudo apt-get install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
```

Expand Down
6 changes: 3 additions & 3 deletions content/manuals/engine/install/rhel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@
```console
$ dnf list docker-ce --showduplicates | sort -r

docker-ce.x86_64 3:27.4.0-1.el9 docker-ce-stable
docker-ce.x86_64 3:27.3.1-1.el9 docker-ce-stable
docker-ce.x86_64 3:{{% param "docker_ce_version" %}}-1.el9 docker-ce-stable
docker-ce.x86_64 3:{{% param "docker_ce_version_prev" %}}-1.el9 docker-ce-stable
<...>
```

Expand All @@ -129,7 +129,7 @@

Install a specific version by its fully qualified package name, which is
the package name (`docker-ce`) plus the version string (2nd column),
separated by a hyphen (`-`). For example, `docker-ce-3:27.4.0-1.el9`.
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}-1.el9`.

Check failure on line 132 in content/manuals/engine/install/rhel.md

View workflow job for this annotation

GitHub Actions / vale 

[vale] reported by reviewdog 🐶
[Vale.Spelling] Did you really mean 'param'?

Raw Output:
{"message": "[Vale.Spelling] Did you really mean 'param'?", "location": {"path": "content/manuals/engine/install/rhel.md", "range": {"start": {"line": 132, "column": 63}}}, "severity": "ERROR"}

Check failure on line 132 in content/manuals/engine/install/rhel.md

View workflow job for this annotation

GitHub Actions / vale 

[vale] reported by reviewdog 🐶
[Vale.Spelling] Did you really mean 'docker_ce_version'?

Raw Output:
{"message": "[Vale.Spelling] Did you really mean 'docker_ce_version'?", "location": {"path": "content/manuals/engine/install/rhel.md", "range": {"start": {"line": 132, "column": 70}}}, "severity": "ERROR"}

Replace `<VERSION_STRING>` with the desired version and then run the following
command to install:
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/engine/install/sles.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,16 @@
```console
$ sudo zypper search -s --match-exact docker-ce | sort -r

v | docker-ce | package | 3:27.4.0-1 | s390x | Docker CE Stable - s390x
v | docker-ce | package | 3:27.3.1-1 | s390x | Docker CE Stable - s390x
v | docker-ce | package | 3:{{% param "docker_ce_version" %}}-1 | s390x | Docker CE Stable - s390x
v | docker-ce | package | 3:{{% param "docker_ce_version_prev" %}}-1 | s390x | Docker CE Stable - s390x
```

The list returned depends on which repositories are enabled, and is specific
to your version of SLES.

Install a specific version by its fully qualified package name, which is
the package name (`docker-ce`) plus the version string (2nd column),
separated by a hyphen (`-`). For example, `docker-ce-3:27.4.0`.
separated by a hyphen (`-`). For example, `docker-ce-3:{{% param "docker_ce_version" %}}`.

Check failure on line 152 in content/manuals/engine/install/sles.md

View workflow job for this annotation

GitHub Actions / vale 

[vale] reported by reviewdog 🐶
[Vale.Spelling] Did you really mean 'param'?

Raw Output:
{"message": "[Vale.Spelling] Did you really mean 'param'?", "location": {"path": "content/manuals/engine/install/sles.md", "range": {"start": {"line": 152, "column": 63}}}, "severity": "ERROR"}

Check failure on line 152 in content/manuals/engine/install/sles.md

View workflow job for this annotation

GitHub Actions / vale 

[vale] reported by reviewdog 🐶
[Vale.Spelling] Did you really mean 'docker_ce_version'?

Raw Output:
{"message": "[Vale.Spelling] Did you really mean 'docker_ce_version'?", "location": {"path": "content/manuals/engine/install/sles.md", "range": {"start": {"line": 152, "column": 70}}}, "severity": "ERROR"}

Replace `<VERSION_STRING>` with the desired version and then run the following
command to install:
Expand Down
6 changes: 3 additions & 3 deletions content/manuals/engine/install/ubuntu.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ Docker from the repository.
# List the available versions:
$ apt-cache madison docker-ce | awk '{ print $3 }'

5:27.4.0-1~ubuntu.24.04~noble
5:27.3.1-1~ubuntu.24.04~noble
5:{{% param "docker_ce_version" %}}-1~ubuntu.24.04~noble
5:{{% param "docker_ce_version_prev" %}}-1~ubuntu.24.04~noble
...
```

Select the desired version and install:

```console
$ VERSION_STRING=5:27.4.0-1~ubuntu.24.04~noble
$ VERSION_STRING=5:{{% param "docker_ce_version" %}}-1~ubuntu.24.04~noble
$ sudo apt-get install docker-ce=$VERSION_STRING docker-ce-cli=$VERSION_STRING containerd.io docker-buildx-plugin docker-compose-plugin
```

Expand Down
1 change: 1 addition & 0 deletions hugo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ params:

latest_engine_api_version: "1.47"
docker_ce_version: "27.4.0"
docker_ce_version_prev: "27.3.1"
Comment on lines 109 to +111
Copy link
Member

@thaJeztah thaJeztah Dec 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think we need to add comments to describe what they're used for?

Copy link
Contributor Author

@dvdksn dvdksn Dec 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would probably be good to add more comments, generally. There's quite a bit of config here. Will do in a followup

Copy link
Contributor Author

@dvdksn dvdksn Dec 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe even restructure the config. It's all in one file now, but we could use a config directory with different files for params, general config, menus, etc.

Copy link
Member

@thaJeztah thaJeztah Dec 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, perhaps splitting could work, although it's not super large, so still somewhat OK (perhaps splitting taxonomy, params could make sense though).

Comments would be good; I think currently for some of these parameters it's clear what it "is", but not what it's for (or intended to be used for)

compose_version: "v2.30.3"
compose_file_v3: "3.8"
compose_file_v2: "2.4"
Expand Down