Skip to content

Commit

Permalink
Merge pull request #915 from ChristianMayer/enhance_docu_TWS_ARM
Browse files Browse the repository at this point in the history
Hint for the rail mounted ARM based smaller TimberWolf servers
  • Loading branch information
peuter committed Mar 25, 2019
2 parents 531399d + c14972f commit 4902a72
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
8 changes: 5 additions & 3 deletions doc/manual/de/install/timberwolf.rst
Expand Up @@ -62,7 +62,8 @@ Anlegen des Containers
Unter *Containers* → *Add Container*

- Name: ``CometVisu``
- Image configuration: Name: ``cometvisu/cometvisu:latest``
- Image configuration: Name: ``cometvisu/cometvisu:latest`` für die "großen" Server
(TSW2xxx) oder ``cometvisu/cometvisu:latest-arm`` für die Hutschienen-Server.
- Port mapping: host ``18080``, container ``80``
- Advanced container settings:

Expand Down Expand Up @@ -232,15 +233,16 @@ kann.

Wie unter :ref:`Docker <docker>` beschrieben hat die neueste
Entwicklunglungsversion den Tag ``testing``. Somit ist unter *Anlegen des
Containers* als ``name`` ``cometvisu/cometvisu:testing`` zu verwenden.
Containers* als ``name`` ``cometvisu/cometvisu:testing`` bzw.
``cometvisu/cometvisu:testing-arm`` zu verwenden.

Um für Fehlerberichte u.ä. eine einheitliche Umgebung zu haben, ist die
Empfehlung die Testing Version mit diesen Parametern zu installieren:

- Container:

- Name: ``CometVisuTest``
- Image configuration: Name: ``cometvisu/cometvisu:testing``
- Image configuration: Name: ``cometvisu/cometvisu:testing`` bzw. ``cometvisu/cometvisu:testing-arm``
- Port mapping: host ``28080``, container ``80``
- Advanced container settings:

Expand Down
8 changes: 5 additions & 3 deletions doc/manual/en/install/timberwolf.rst
Expand Up @@ -61,7 +61,9 @@ Creating a Container
Under: *Containers* → *Add Container*

- Name: ``CometVisu``
- Image configuration: Name: ``cometvisu/cometvisu:latest``
- Image configuration: Name: ``cometvisu/cometvisu:latest`` for the big servers
(TWS2xxx) or ``cometvisu/cometvisu:latest-arm`` for the rail mounted smaller
servers
- Port mapping: host ``18080``, container ``80``
- Advanced container settings:

Expand Down Expand Up @@ -230,7 +232,7 @@ incompatibly due to future updates.
As described under :ref:`Docker <docker>` has the newest
Development version the day ``testing``. Thus, under
*Creating the container* as ``name`` ``cometvisu/cometvisu:testing``
to use.
or ``cometvisu/cometvisu:testing-arm`` to use.


In order to have a uniform environment for error reporting, etc.
Expand All @@ -239,7 +241,7 @@ the testing version should be installed with these parameters:
- Container:

- Name: ``CometVisuTest``
- Image configuration: Name: ``cometvisu/cometvisu:testing``
- Image configuration: Name: ``cometvisu/cometvisu:testing`` or ``cometvisu/cometvisu:testing-arm``
- Port mapping: host ``28080``, container ``80``
- Advanced container settings:

Expand Down

0 comments on commit 4902a72

Please sign in to comment.