Browse Source

Corrections from feedback from @md5

Greg Wilkins 10 years ago
parent
commit
bbf3755ea5
1 changed files with 7 additions and 11 deletions
  1. 7 11
      jetty/content.md

+ 7 - 11
jetty/content.md

@@ -8,7 +8,7 @@ Jetty is a pure Java-based HTTP (Web) server and Java Servlet container. While W
 
 # How to use this image.
 
-Run the default Jetty server (`CMD ["java","-Djava.io.tmpdir=/tmp/jetty","-jar","/usr/local/jetty/start.jar"]`):
+Run the default Jetty server:
 
 ```console
 $ docker run -d %%REPO%%:9
@@ -26,10 +26,6 @@ The default Jetty environment in the image is:
 
 	JETTY_HOME    =  /usr/local/jetty
 	JETTY_BASE    =  /var/lib/jetty
-	JETTY_CONF    =  /usr/local/jetty/etc/jetty.conf # Deprecated
-	JETTY_STATE   =  /run/jetty/jetty.state          # Deprecated
-	JETTY_ARGS    =                                  # Deprecated
-	JAVA_OPTIONS  =                                  # Deprecated
 	TMPDIR        =  /tmp/jetty
 
 ## Deployment
@@ -40,21 +36,21 @@ For older EOL'd images based on Jetty 7 or Jetty 8, please follow the [legacy in
 
 ## Configuration
 
-The configuration of the jetty server can be reported by running with the --list-config option:
+The configuration of the Jetty server can be reported by running with the `--list-config` option:
 ```console
 $ docker run -d %%REPO%%:9 --list-config
 ```
-Configuration such as parameters and additional modules may also be passed in via the command line. For example
+Configuration such as parameters and additional modules may also be passed in via the command line. For example:
 ```console
 $ docker run -d %%REPO%%:9 --modules=jmx jetty.threadPool.maxThreads=500
 ```
-To update the server configuration in a new docker image, the Dockerfile may enamble additional modules with RUN commands like:
+To update the server configuration in a derived Docker image, the `Dockerfile` may
+enable additional modules with `RUN` commands like:
 ```
 WORKDIR $JETTY_BASE
-RUN java -jar "$JETTY_HOME/start.jar" --add-to-startd=jmx,http2
+RUN java -jar "$JETTY_HOME/start.jar" --add-to-startd=jmx,stats
 ```
-Modules may be configured in a Dockerfile by editing the properties in corresponding `/var/lib/jetty/start.d/*.mod` file or the module can be deactivated by
-removing that file.
+Modules may be configured in a `Dockerfile` by editing the properties in the corresponding `/var/lib/jetty/start.d/*.mod` file or the module can be deactivated by removing that file.
 
 ## Read-only container