Quellcode durchsuchen

HUE-8743 [docker] Small docker README typo fixes

Romain vor 6 Jahren
Ursprung
Commit
4a22d47efc
2 geänderte Dateien mit 18 neuen und 19 gelöschten Zeilen
  1. 11 13
      desktop/core/src/desktop/templates/hue.mako
  2. 7 6
      tools/docker/hue/README.md

+ 11 - 13
desktop/core/src/desktop/templates/hue.mako

@@ -169,8 +169,8 @@
 % endif
 
 <div id="jHueNotify" class="alert hide">
-    <button class="close">&times;</button>
-    <div class="message"></div>
+  <button class="close">&times;</button>
+  <div class="message"></div>
 </div>
 
 
@@ -186,21 +186,21 @@ ${ hueIcons.symbols() }
       ${ banner_message or conf.CUSTOM.BANNER_TOP_HTML.get() | n,unicode }
     </div>
   % endif
+
   % if not IS_EMBEDDED.get():
   <nav class="navbar navbar-default">
     <div class="navbar-inner top-nav">
       <div class="top-nav-left">
         % if not IS_EMBEDDED.get():
-        % if not (IS_MULTICLUSTER_ONLY.get() and has_multi_cluster()):
-        <a class="hamburger hamburger-hue pull-left" data-bind="toggle: leftNavVisible, css: { 'is-active': leftNavVisible }">
-          <span class="hamburger-box"><span class="hamburger-inner"></span></span>
-        </a>
-
-        <a class="brand" data-bind="hueLink: '/home/'" href="javascript: void(0);" title="${_('Documents')}">
-            <svg style="height: 24px; width: 120px;"><use xlink:href="#hi-logo"></use></svg>
-        </a>
-        % endif
+          % if not (IS_MULTICLUSTER_ONLY.get() and has_multi_cluster()):
+          <a class="hamburger hamburger-hue pull-left" data-bind="toggle: leftNavVisible, css: { 'is-active': leftNavVisible }">
+            <span class="hamburger-box"><span class="hamburger-inner"></span></span>
+          </a>
 
+          <a class="brand" data-bind="hueLink: '/home/'" href="javascript: void(0);" title="${_('Documents')}">
+              <svg style="height: 24px; width: 120px;"><use xlink:href="#hi-logo"></use></svg>
+          </a>
+          % endif
         % endif
 
         % if not IS_MULTICLUSTER_ONLY.get():
@@ -253,7 +253,6 @@ ${ hueIcons.symbols() }
       </div>
 
       <div class="top-nav-right">
-
         % if user.is_authenticated() and section != 'login' and (cluster != ANALYTIC_DB or IS_MULTICLUSTER_ONLY.get()):
         <div class="dropdown navbar-dropdown pull-right">
           % if IS_MULTICLUSTER_ONLY.get():
@@ -302,7 +301,6 @@ ${ hueIcons.symbols() }
     </div>
     <div id="mini_jobbrowser"></div>
   </div>
-
   % endif
 
   <div class="content-wrapper">

+ 7 - 6
tools/docker/hue/README.md

@@ -7,6 +7,7 @@ Just pull the latest from the Internet or build it yourself from the Hue reposit
 
 
 ### Pull the image from Docker Hub
+
 ```
 sudo docker pull gethue/hue:latest
 ```
@@ -32,8 +33,8 @@ Feel free to replace `-t hue` in all the commands by your own docker repository
 **Tag and push the image to the container registry**
 
 ```
-docker build . -t docker-registry.gethue.com/gethue/hue:v4.4
-docker push docker-registry.gethue.com/gethue/hue:v4.4
+docker build . -t docker-registry.gethue.com/gethue/hue:4.4.0
+docker push docker-registry.gethue.com/gethue/hue:4.4.0
 ```
 
 
@@ -53,11 +54,11 @@ Hue should then be up and running on your default Docker IP on the port 8888, so
 #### Configuration
 
 By default the Hue container is using
-[``tools/docker/hue/conf/z-defaults.ini``](/tools/docker/hue/conf/z-defaults.ini) on top of [``desktop/conf/hue.ini``](/desktop/conf/hue.ini) which assumes localhost for all the data services and uses and embedded sqlite database that often errors.
+[``tools/docker/hue/conf/z-defaults.ini``](/tools/docker/hue/conf/z-defaults.ini) on top of [``desktop/conf/hue.ini``](/desktop/conf/hue.ini) which assumes localhost for all the data services and uses and embedded sqlite database that will error out.
 
 The default ini is used for configuration at the image build time (e.g. which apps to always disable or certain settings like [banner customization](http://gethue.com/add-a-top-banner-to-hue/)).
 
-In order to configure Hue at runtime and for example point to external services, use the simplified ini [``hue.ini``](/tools/docker/hue/hue.ini), edit the values before starting it via:
+In order to be useful, configure Hue at runtime to point to external services. The simplified ini [``hue.ini``](/tools/docker/hue/hue.ini) can be edited before starting Hue via:
 
 ```
 docker run -it -p 8888:8888 -v $PWD/tools/docker/hue/hue.ini:/usr/share/hue/desktop/conf/z-hue.ini gethue/hue
@@ -73,9 +74,9 @@ docker run -it -p 8888:8888 -v $PWD/hue.ini:/usr/share/hue/desktop/conf/z-hue.in
 
 *Note*
 
-If for example the database is pointing to your localhost, if using Docker on Linux just add the '--network="host"' parameter and the container will correctly point to it.
+If for example the database is pointing to your localhost, if using Docker on Linux just add the `--network="host"` parameter and the container will correctly point to it.
 
-    sudo docker run -it -p 8888:8888 -v $PWD/desktop/conf/pseudo-distributed.ini:/usr/share/hue/desktop/conf/z-hue.ini --network="host" hue
+    sudo docker run -it -p 8888:8888 -v $PWD/desktop/conf/pseudo-distributed.ini:/usr/share/hue/desktop/conf/z-hue.ini --network="host" gethue/hue
 
 
 #### Docker Compose