Browse Source

Run update.sh

Docker Library Bot 5 years ago
parent
commit
d4e97cf09d
2 changed files with 12 additions and 18 deletions
  1. 6 6
      kong/README.md
  2. 6 12
      tomcat/README.md

+ 6 - 6
kong/README.md

@@ -19,12 +19,12 @@ WARNING:
 -	[`2.0.0rc2-alpine`, `2.0.0rc1`](https://github.com/Kong/docker-kong/blob/2b9a246a15eb3c43d6e589e7ede45e8c7d94b9be/alpine/Dockerfile)
 -	[`2.0.0rc2-ubuntu`](https://github.com/Kong/docker-kong/blob/2b9a246a15eb3c43d6e589e7ede45e8c7d94b9be/ubuntu/Dockerfile)
 -	[`2.0.0rc2-centos`](https://github.com/Kong/docker-kong/blob/2b9a246a15eb3c43d6e589e7ede45e8c7d94b9be/centos/Dockerfile)
--	[`1.4.2-alpine`, `1.4.2`, `1.4`, `alpine`, `latest`](https://github.com/Kong/docker-kong/blob/3d81dc228e60ba75f1fc39b6d4808fd4ba95cd9e/alpine/Dockerfile)
--	[`1.4.2-ubuntu`, `1.4-ubuntu`, `ubuntu`](https://github.com/Kong/docker-kong/blob/3d81dc228e60ba75f1fc39b6d4808fd4ba95cd9e/ubuntu/Dockerfile)
--	[`1.4.2-centos`, `1.4-centos`, `centos`](https://github.com/Kong/docker-kong/blob/3d81dc228e60ba75f1fc39b6d4808fd4ba95cd9e/centos/Dockerfile)
--	[`1.3.0-alpine`, `1.3.0`, `1.3`](https://github.com/Kong/docker-kong/blob/c99d107b7c82d1f58e913d2d2c8ac4fad1ee62f0/alpine/Dockerfile)
--	[`1.3.0-ubuntu`, `1.3-ubuntu`](https://github.com/Kong/docker-kong/blob/c99d107b7c82d1f58e913d2d2c8ac4fad1ee62f0/ubuntu/Dockerfile)
--	[`1.3.0-centos`, `1.3-centos`](https://github.com/Kong/docker-kong/blob/c99d107b7c82d1f58e913d2d2c8ac4fad1ee62f0/centos/Dockerfile)
+-	[`1.4.3-alpine`, `1.4.3`, `1.4`, `alpine`, `latest`](https://github.com/Kong/docker-kong/blob/3d9cd4bb1678aee6446b0c3f392ef37f34212c99/alpine/Dockerfile)
+-	[`1.4.3-ubuntu`, `1.4-ubuntu`, `ubuntu`](https://github.com/Kong/docker-kong/blob/3d9cd4bb1678aee6446b0c3f392ef37f34212c99/ubuntu/Dockerfile)
+-	[`1.4.3-centos`, `1.4-centos`, `centos`](https://github.com/Kong/docker-kong/blob/3d9cd4bb1678aee6446b0c3f392ef37f34212c99/centos/Dockerfile)
+-	[`1.3.1-alpine`, `1.3.1`, `1.3`](https://github.com/Kong/docker-kong/blob/48b240c47a4d902ddcc20de408e2c08855a5feca/alpine/Dockerfile)
+-	[`1.3.1-ubuntu`, `1.3-ubuntu`](https://github.com/Kong/docker-kong/blob/48b240c47a4d902ddcc20de408e2c08855a5feca/ubuntu/Dockerfile)
+-	[`1.3.1-centos`, `1.3-centos`](https://github.com/Kong/docker-kong/blob/48b240c47a4d902ddcc20de408e2c08855a5feca/centos/Dockerfile)
 -	[`1.2.3-alpine`, `1.2.3`, `1.2`](https://github.com/Kong/docker-kong/blob/f5512d2898dad8ad6c95d42b1762ea004713d519/alpine/Dockerfile)
 -	[`1.2.3-centos`, `1.2-centos`](https://github.com/Kong/docker-kong/blob/f5512d2898dad8ad6c95d42b1762ea004713d519/centos/Dockerfile)
 -	[`1.1.3-alpine`, `1.1.3`, `1.1`](https://github.com/Kong/docker-kong/blob/196331b1e6b4798032af4d6c218a441e2c8db74d/alpine/Dockerfile)

+ 6 - 12
tomcat/README.md

@@ -79,21 +79,23 @@ Apache Tomcat (or simply Tomcat) is an open source web server and servlet contai
 
 # How to use this image.
 
+**Note:** as of [docker-library/tomcat#181](https://github.com/docker-library/tomcat/pull/181), the upstream-provided (example) webapps are *not* enabled by default, per [upstream's security recommendations](https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#Default_web_applications), but are still available under the `webapps.dist` folder within the image to make them easier to re-enable.
+
 Run the default Tomcat server (`CMD ["catalina.sh", "run"]`):
 
 ```console
-$ docker run -it --rm tomcat:8.0
+$ docker run -it --rm tomcat:9.0
 ```
 
 You can test it by visiting `http://container-ip:8080` in a browser or, if you need access outside the host, on port 8888:
 
 ```console
-$ docker run -it --rm -p 8888:8080 tomcat:8.0
+$ docker run -it --rm -p 8888:8080 tomcat:9.0
 ```
 
-You can then go to `http://localhost:8888` or `http://host-ip:8888` in a browser.
+You can then go to `http://localhost:8888` or `http://host-ip:8888` in a browser (noting that it will return a 404 since there are no webapps loaded by default).
 
-The default Tomcat environment in the image for versions 7 and 8 is:
+The default Tomcat environment in the image is:
 
 	CATALINA_BASE:   /usr/local/tomcat
 	CATALINA_HOME:   /usr/local/tomcat
@@ -101,14 +103,6 @@ The default Tomcat environment in the image for versions 7 and 8 is:
 	JRE_HOME:        /usr
 	CLASSPATH:       /usr/local/tomcat/bin/bootstrap.jar:/usr/local/tomcat/bin/tomcat-juli.jar
 
-The default Tomcat environment in the image for version 6 is:
-
-	CATALINA_BASE:   /usr/local/tomcat
-	CATALINA_HOME:   /usr/local/tomcat
-	CATALINA_TMPDIR: /usr/local/tomcat/temp
-	JRE_HOME:        /usr
-	CLASSPATH:       /usr/local/tomcat/bin/bootstrap.jar
-
 The configuration files are available in `/usr/local/tomcat/conf/`. By default, no user is included in the "manager-gui" role required to operate the "/manager/html" web application. If you wish to use this app, you must define such a user in `tomcat-users.xml`.
 
 # Image Variants