Skip to content

Commit a938783

Browse files
thomaskoslowskiMattias Schlenker
thomaskoslowski
authored and
Mattias Schlenker
committed
KNW-2015, prepare edition renaming, pick-24
1 parent 0c668a4 commit a938783

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎src/onprem/de/introduction_docker.asciidoc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ Dabei sind die Images aus den unterschiedlichen Quellen für eine Edition jeweil
4747
[#image_sources]
4848
[cols="25,~,~,~,~"]
4949
|===
50-
|{CRE} |link:https://hub.docker.com/r/checkmk/check-mk-raw/[Docker Hub^] | link:https://checkmk.com/de/download?platform=docker&edition=cre[{CMK}-Download-Seite^] |-- |--
50+
|{CRE} |link:https://hub.docker.com/r/checkmk/{pkg-cre}/[Docker Hub^] | link:https://checkmk.com/de/download?platform=docker&edition=cre[{CMK}-Download-Seite^] |-- |--
5151
|{CSE} | -- |link:https://checkmk.com/de/download?platform=docker&edition=cee[{CMK}-Download-Seite^] |link:https://portal.checkmk.com/de/[{CMK}-Kundenportal^] |xref:registry_images[{CMK} Docker Registry]
52-
|{CCE} |link:https://hub.docker.com/r/checkmk/check-mk-cloud/[Docker Hub^] |link:https://checkmk.com/de/download?platform=docker&edition=cce[{CMK}-Download-Seite^] |link:https://portal.checkmk.com/de/[{CMK}-Kundenportal^] |--
53-
|{CME} |link:https://hub.docker.com/r/checkmk/check-mk-managed/[Docker Hub^] |link:https://checkmk.com/de/download?platform=docker&edition=cme[{CMK}-Download-Seite^] |link:https://portal.checkmk.com/de/[{CMK}-Kundenportal^] |--
52+
|{CCE} |link:https://hub.docker.com/r/checkmk/{pkg-cce}/[Docker Hub^] |link:https://checkmk.com/de/download?platform=docker&edition=cce[{CMK}-Download-Seite^] |link:https://portal.checkmk.com/de/[{CMK}-Kundenportal^] |--
53+
|{CME} |link:https://hub.docker.com/r/checkmk/{pkg-cme}/[Docker Hub^] |link:https://checkmk.com/de/download?platform=docker&edition=cme[{CMK}-Download-Seite^] |link:https://portal.checkmk.com/de/[{CMK}-Kundenportal^] |--
5454
|===
5555

5656
Beim ersten Start eines dieser Images wird nicht nur der passende Container ausgeführt, sondern auch gleich eine Monitoring-Instanz mit dem Namen `cmk` eingerichtet und gestartet.
@@ -92,7 +92,7 @@ Geben Sie dazu beim Containerstart den vollen Pfad zum gewünschten Image an.
9292
Die Docker Engine prüft dann, ob das Image bereits lokal verfügbar ist, und lädt es andernfalls automatisch herunter.
9393

9494
Für die Version {current} von {SE} geben Sie zum Beispiel beim xref:#container_start[Containerstart] den vollen Pfad für das Image wie folgt an:
95-
`registry.checkmk.com/enterprise/check-mk-enterprise:{current}`
95+
`registry.checkmk.com/enterprise/{pkg-cee}:{current}`
9696

9797
// Für die entsprechenden Versionen von {CE} oder {ME} ersetzen Sie in diesem Pfad alle Vorkommen von `enterprise` durch `cloud` beziehungsweise `managed`.
9898

@@ -113,7 +113,7 @@ Mit `docker load -i` stellen Sie dann die Image-Datei für die Docker Engine auf
113113
1ba0c3ef2749: Loading layer [==================================================>] 279.7MB/279.7MB
114114
bebf82ffc112: Loading layer [==================================================>] 1.291GB/1.291GB
115115
88b55249828a: Loading layer [==================================================>] 7.168kB/7.168kB
116-
Loaded image: checkmk/check-mk-raw:{current}
116+
Loaded image: checkmk/{pkg-cre}:{current}
117117
----
118118

119119

@@ -139,7 +139,7 @@ Die enthaltenen Parameter und ihre Werte werden nachfolgend erläutert.
139139
----
140140
services:
141141
checkmk:
142-
image: "checkmk/check-mk-raw:{current-major}-latest"
142+
image: "checkmk/{pkg-cre}:{current-major}-latest"
143143
container_name: "monitoring"
144144
environment:
145145
- CMK_PASSWORD=mypassword
@@ -167,7 +167,7 @@ Nähere Informationen zu den benutzten Optionen:
167167

168168
| `checkmk:` | Selbst gewählter sprechender Name für den Docker-Service, für den der {CMK}-Container gestartet werden soll.
169169

170-
| `image: "checkmk/check-mk-raw:{current-major}-latest"` | Bezeichnung des {CMK}-Images im Format `<Repository>:<Tag>`.
170+
| `image: "checkmk/{pkg-cre}:{current-major}-latest"` | Bezeichnung des {CMK}-Images im Format `<Repository>:<Tag>`.
171171
Die Bezeichnungen für bereits vorhandene Images können Sie über den Befehl `docker images` auslesen.
172172
Falls Sie das Image aus der {CMK} Docker-Registry beziehen, muss das Image mit seinem vollen Pfad angegeben werden.
173173

@@ -302,7 +302,7 @@ Dabei übergeben Sie die Angaben aus der `compose.yaml`-Datei nun als Parameter.
302302

303303
Der folgende Befehl erzeugt den gleichen Container mit den gleichen xref:container_options[Eigenschaften] wie im eben gezeigten Beispiel.
304304
Die gezeigte Ausgabe basiert auf einem Szenario, in dem das Image noch nicht manuell heruntergeladen wurde.
305-
Optional erzwingen Sie wieder mit einem vorangestellten `docker pull checkmk/check-mk-raw:{current-major}-latest` das Herunterladen des aktuellsten Images.
305+
Optional erzwingen Sie wieder mit einem vorangestellten `docker pull checkmk/{pkg-cre}:{current-major}-latest` das Herunterladen des aktuellsten Images.
306306

307307
[{shell}]
308308
----
@@ -315,17 +315,17 @@ Optional erzwingen Sie wieder mit einem vorangestellten `docker pull checkmk/che
315315
-p 8080:5000 \
316316
-p 8000:8000 \
317317
--restart always \
318-
checkmk/check-mk-raw:{current-major}-latest
319-
Unable to find image 'checkmk/check-mk-raw:{current-major}-latest' locally
320-
{current-major}-latest: Pulling from checkmk/check-mk-raw
318+
checkmk/{pkg-cre}:{current-major}-latest
319+
Unable to find image 'checkmk/{pkg-cre}:{current-major}-latest' locally
320+
{current-major}-latest: Pulling from checkmk/{pkg-cre}
321321
215ed5a63843: Pull complete
322322
942691e22878: Pull complete
323323
fafdf3fa2522: Pull complete
324324
1888d204a5e5: Pull complete
325325
c126aa904d34: Pull complete
326326
b469f01932b5: Pull complete
327327
Digest: sha256:bbabed3f4f5e88775f872bcf0f1df36660e13d0ebf613e4e6141f4c81e5c6354
328-
Status: Downloaded newer image for checkmk/check-mk-raw:{current-major}-latest
328+
Status: Downloaded newer image for checkmk/{pkg-cre}:{current-major}-latest
329329
c850572de41592afff9de610d1ef3faecb267bf4fbccf2a9d8dae92dec11aacb
330330
----
331331

‎src/onprem/en/introduction_docker.asciidoc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ The images from the different sources for an edition are identical.
4848
[#image_sources]
4949
[cols="25,~,~,~,~"]
5050
|===
51-
|{CRE} |link:https://hub.docker.com/r/checkmk/check-mk-raw/[Docker Hub^] | link:https://checkmk.com/download?platform=docker&edition=cre[{CMK} downloads page^] |-- |--
51+
|{CRE} |link:https://hub.docker.com/r/checkmk/{pkg-cre}/[Docker Hub^] | link:https://checkmk.com/download?platform=docker&edition=cre[{CMK} downloads page^] |-- |--
5252
|{CSE} | -- |link:https://checkmk.com/download?platform=docker&edition=cee[{CMK} downloads page^] |link:https://portal.checkmk.com/[{CMK} customer portal^] |xref:registry_images[{CMK} Docker Registry]
53-
|{CCE} |link:https://hub.docker.com/r/checkmk/check-mk-cloud/[Docker Hub^] |link:https://checkmk.com/download?platform=docker&edition=cce[{CMK} downloads page^] |link:https://portal.checkmk.com/[{CMK} customer portal^] |--
54-
|{CME} |link:https://hub.docker.com/r/checkmk/check-mk-managed/[Docker Hub^] |link:https://checkmk.com/download?platform=docker&edition=cme[{CMK} downloads page^] |link:https://portal.checkmk.com/[{CMK} customer portal^] |--
53+
|{CCE} |link:https://hub.docker.com/r/checkmk/{pkg-cce}/[Docker Hub^] |link:https://checkmk.com/download?platform=docker&edition=cce[{CMK} downloads page^] |link:https://portal.checkmk.com/[{CMK} customer portal^] |--
54+
|{CME} |link:https://hub.docker.com/r/checkmk/{pkg-cme}/[Docker Hub^] |link:https://checkmk.com/download?platform=docker&edition=cme[{CMK} downloads page^] |link:https://portal.checkmk.com/[{CMK} customer portal^] |--
5555
|===
5656

5757
When one of these images is started for the first time, not only will the appropriate container be executed, but a monitoring site named `cmk` will also be set up and started.
@@ -91,7 +91,7 @@ To do this, specify the full path to the desired image when starting the contain
9191
The Docker Engine then checks whether the image is already available locally and, if not, downloads it automatically.
9292

9393
For version {current} of {SE}, for example, specify the full path for the image when xref:#container_start[starting the container] as follows:
94-
`registry.checkmk.com/enterprise/check-mk-enterprise:{current}`
94+
`registry.checkmk.com/enterprise/{pkg-cee}:{current}`
9595

9696
[#manual_download]
9797
=== Downloading and preparing images manually
@@ -109,7 +109,7 @@ Then use `docker load -i` to make the image file available to the Docker Engine
109109
1ba0c3ef2749: Loading layer [==================================================>] 279.7MB/279.7MB
110110
bebf82ffc112: Loading layer [==================================================>] 1.291GB/1.291GB
111111
88b55249828a: Loading layer [==================================================>] 7.168kB/7.168kB
112-
Loaded image: checkmk/check-mk-raw:{current}
112+
Loaded image: checkmk/{pkg-cre}:{current}
113113
----
114114

115115

@@ -136,7 +136,7 @@ The parameters contained and their values are explained below.
136136
----
137137
services:
138138
checkmk:
139-
image: "checkmk/check-mk-raw:{current-major}-latest"
139+
image: "checkmk/{pkg-cre}:{current-major}-latest"
140140
container_name: "monitoring"
141141
environment:
142142
- CMK_PASSWORD=mypassword
@@ -163,7 +163,7 @@ More information about the options used:
163163

164164
| `checkmk:` | Self-defined descriptive name for the Docker service for which the {CMK} container is to be started.
165165

166-
| `image: "checkmk/check-mk-raw:{current-major}-latest"` | Name of the {CMK} image in the format `<repository>:<tag>`.
166+
| `image: "checkmk/{pkg-cre}:{current-major}-latest"` | Name of the {CMK} image in the format `<repository>:<tag>`.
167167

168168
You can read the names of existing images using the `docker images` command.
169169

@@ -299,7 +299,7 @@ To do this, pass the information from the `compose.yaml` file as parameters.
299299

300300
The following command creates the same container with the same xref:#container_options[properties] as in the example shown above.
301301
The output shown is based on a scenario in which the image has not yet been downloaded manually.
302-
Optionally, you can force the download of the latest image by prefixing `docker pull checkmk/check-mk-raw:{current-major}-latest`.
302+
Optionally, you can force the download of the latest image by prefixing `docker pull checkmk/{pkg-cre}:{current-major}-latest`.
303303

304304
[{shell}]
305305
----
@@ -312,17 +312,17 @@ Optionally, you can force the download of the latest image by prefixing `docker
312312
-p 8080:5000 \
313313
-p 8000:8000 \
314314
--restart always \
315-
checkmk/check-mk-raw:{current-major}-latest
316-
Unable to find image 'checkmk/check-mk-raw:{current-major}-latest' locally
317-
{current-major}-latest: Pulling from checkmk/check-mk-raw
315+
checkmk/{pkg-cre}:{current-major}-latest
316+
Unable to find image 'checkmk/{pkg-cre}:{current-major}-latest' locally
317+
{current-major}-latest: Pulling from checkmk/{pkg-cre}
318318
215ed5a63843: Pull complete
319319
942691e22878: Pull complete
320320
fafdf3fa2522: Pull complete
321321
1888d204a5e5: Pull complete
322322
c126aa904d34: Pull complete
323323
b469f01932b5: Pull complete
324324
Digest: sha256:bbabed3f4f5e88775f872bcf0f1df36660e13d0ebf613e4e6141f4c81e5c6354
325-
Status: Downloaded newer image for checkmk/check-mk-raw:{current-major}-latest
325+
Status: Downloaded newer image for checkmk/{pkg-cre}:{current-major}-latest
326326
c850572de41592afff9de610d1ef3faecb267bf4fbccf2a9d8dae92dec11aacb
327327
----
328328

0 commit comments

Comments
 (0)