From 1ceaa19dbafa9acb5284fa515920699132916bc6 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 13 Sep 2019 21:17:15 +0000 Subject: [PATCH] Run update.sh --- tomee/README.md | 39 ++++++++++--------- traefik/README.md | 98 ++++++++++++++++++++++++++++++++++++++--------- vault/README.md | 2 +- 3 files changed, 101 insertions(+), 38 deletions(-) diff --git a/tomee/README.md b/tomee/README.md index d518b7a43..ec60d84e4 100644 --- a/tomee/README.md +++ b/tomee/README.md @@ -16,24 +16,27 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`8-jre-1.7.5-jaxrs`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-1.7.5-jaxrs/Dockerfile) -- [`8-jre-1.7.5-plume`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-1.7.5-plume/Dockerfile) -- [`8-jre-1.7.5-plus`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-1.7.5-plus/Dockerfile) -- [`8-jre-1.7.5-webprofile`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-1.7.5-webprofile/Dockerfile) -- [`8-jre-7.0.4-plume`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-7.0.4-plume/Dockerfile) -- [`8-jre-7.0.4-plus`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-7.0.4-plus/Dockerfile) -- [`8-jre-7.0.4-webprofile`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-7.0.4-webprofile/Dockerfile) -- [`8-jre-7.0.5-plume`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-7.0.5-plume/Dockerfile) -- [`8-jre-7.0.5-plus`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-7.0.5-plus/Dockerfile) -- [`8-jre-7.0.5-webprofile`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-7.0.5-webprofile/Dockerfile) -- [`8-jre-7.1.0-plume`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-7.1.0-plume/Dockerfile) -- [`8-jre-7.1.0-plus`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-7.1.0-plus/Dockerfile) -- [`8-jre-7.1.0-microprofile`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-7.1.0-microprofile/Dockerfile) -- [`8-jre-7.1.0-webprofile`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/8-jre-7.1.0-webprofile/Dockerfile) -- [`11-jre-8.0.0-M3-plume`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/11-jre-8.0.0-M3-plume/Dockerfile) -- [`11-jre-8.0.0-M3-plus`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/11-jre-8.0.0-M3-plus/Dockerfile) -- [`11-jre-8.0.0-M3-microprofile`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/11-jre-8.0.0-M3-microprofile/Dockerfile) -- [`11-jre-8.0.0-M3-webprofile`, `latest`](https://github.com/tomitribe/docker-tomee/blob/52efab45bc8f74a1ce70f1e5cd03b52eb139e1f3/11-jre-8.0.0-M3-webprofile/Dockerfile) +- [`8-jre-1.7.5-jaxrs`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-1.7.5-jaxrs/Dockerfile) +- [`8-jre-1.7.5-plume`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-1.7.5-plume/Dockerfile) +- [`8-jre-1.7.5-plus`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-1.7.5-plus/Dockerfile) +- [`8-jre-1.7.5-webprofile`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-1.7.5-webprofile/Dockerfile) +- [`8-jre-7.0.4-plume`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.0.4-plume/Dockerfile) +- [`8-jre-7.0.4-plus`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.0.4-plus/Dockerfile) +- [`8-jre-7.0.4-webprofile`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.0.4-webprofile/Dockerfile) +- [`8-jre-7.0.5-plume`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.0.5-plume/Dockerfile) +- [`8-jre-7.0.5-plus`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.0.5-plus/Dockerfile) +- [`8-jre-7.0.5-webprofile`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.0.5-webprofile/Dockerfile) +- [`8-jre-7.0.6-plume`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.0.6-plume/Dockerfile) +- [`8-jre-7.0.6-plus`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.0.6-plus/Dockerfile) +- [`8-jre-7.0.6-webprofile`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.0.6-webprofile/Dockerfile) +- [`8-jre-7.1.0-plume`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.1.0-plume/Dockerfile) +- [`8-jre-7.1.0-plus`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.1.0-plus/Dockerfile) +- [`8-jre-7.1.0-microprofile`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.1.0-microprofile/Dockerfile) +- [`8-jre-7.1.0-webprofile`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/8-jre-7.1.0-webprofile/Dockerfile) +- [`11-jre-8.0.0-M3-plume`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/11-jre-8.0.0-M3-plume/Dockerfile) +- [`11-jre-8.0.0-M3-plus`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/11-jre-8.0.0-M3-plus/Dockerfile) +- [`11-jre-8.0.0-M3-microprofile`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/11-jre-8.0.0-M3-microprofile/Dockerfile) +- [`11-jre-8.0.0-M3-webprofile`, `latest`](https://github.com/tomitribe/docker-tomee/blob/fbe01211d21051406ffaae5bdf41d1f629caf58f/11-jre-8.0.0-M3-webprofile/Dockerfile) # Quick reference diff --git a/traefik/README.md b/traefik/README.md index 061b27e9d..e3781db1f 100644 --- a/traefik/README.md +++ b/traefik/README.md @@ -48,27 +48,82 @@ WARNING: ![logo](https://raw.githubusercontent.com/docker-library/docs/a6cc2c5f4bc6658168f2a0abbb0307acaefff80e/traefik/logo.png) -[Traefik](https://github.com/containous/traefik) is a modern HTTP reverse proxy and load balancer that makes deploying microservices easy. +[Traefik](https://traefik.io) is a modern HTTP reverse proxy and load balancer that makes deploying microservices easy. Traefik integrates with your existing infrastructure components ([Docker](https://www.docker.com/), [Swarm mode](https://docs.docker.com/engine/swarm/), [Kubernetes](https://kubernetes.io), [Marathon](https://mesosphere.github.io/marathon/), [Consul](https://www.consul.io/), [Etcd](https://coreos.com/etcd/), [Rancher](https://rancher.com), [Amazon ECS](https://aws.amazon.com/ecs), ...) and configures itself automatically and dynamically. -Telling Traefik where your orchestrator is could be the *only* configuration step you need to do. +Pointing Traefik at your orchestrator should be the *only* configuration step you need. -# Example usage +# Traefik v2 - Example usage -Grab a [sample configuration file](https://raw.githubusercontent.com/containous/traefik/master/traefik.sample.toml) and rename it to `traefik.toml`. Enable `docker` provider and web UI: +Enable `docker` provider and web UI: + +```yml +## traefik.yml + +# Docker configuration backend +providers: + docker: + defaultRule: "Host(`{{ trimPrefix `/` .Name }}.docker.localhost`)" + +# API and dashboard configuration +api: + insecure: true +``` + +Start Traefik: + +```bash +docker run -d -p 8080:8080 -p 80:80 \ +-v $PWD/traefik.yml:/etc/traefik/traefik.yml \ +-v /var/run/docker.sock:/var/run/docker.sock \ +traefik:v2.0 +``` + +Start a backend server, named `test`: + +```bash +docker run -d --name test containous/whoami +``` + +And finally, you can access to your `whoami` server throught Traefik, on the domain name `test.docker.localhost`: + +```console +# $ curl --header 'Host:test.docker.localhost' 'http://localhost:80/' +$ curl test.docker.localhost +Hostname: 390a880bdfab +IP: 127.0.0.1 +IP: 172.17.0.3 +GET / HTTP/1.1 +Host: test.docker.localhost +User-Agent: curl/7.65.3 +Accept: */* +Accept-Encoding: gzip +X-Forwarded-For: 172.17.0.1 +X-Forwarded-Host: test.docker.localhost +X-Forwarded-Port: 80 +X-Forwarded-Proto: http +X-Forwarded-Server: 7e073cb54211 +X-Real-Ip: 172.17.0.1 +``` + +The web UI [http://localhost:8080](http://localhost:8080) will give you an overview of the routers, services, and middlewares. + +![Web UI](https://raw.githubusercontent.com/containous/traefik/v2.0/docs/content/assets/img/webui-dashboard.png) + +# Traefik v1 - Example usage + +Grab a [sample configuration file](https://raw.githubusercontent.com/containous/traefik/v1.7/traefik.sample.toml) and rename it to `traefik.toml`. Enable `docker` provider and web UI: ```toml -################################################################ +## traefik.toml + # API and dashboard configuration -################################################################ [api] -################################################################ + # Docker configuration backend -################################################################ [docker] -domain = "docker.local" -watch = true + domain = "docker.localhost" ``` Start Traefik: @@ -77,26 +132,27 @@ Start Traefik: docker run -d -p 8080:8080 -p 80:80 \ -v $PWD/traefik.toml:/etc/traefik/traefik.toml \ -v /var/run/docker.sock:/var/run/docker.sock \ -traefik +traefik:v1.7 ``` Start a backend server, named `test`: ```bash -docker run -d --name test emilevauge/whoami +docker run -d --name test containous/whoami ``` -And finally, you can access to your `whoami` server throught Traefik, on the domain name `{containerName}.{configuredDomain}`: +And finally, you can access to your `whoami` server throught Traefik, on the domain name `{containerName}.{configuredDomain}` (`test.docker.localhost`): -```bash -curl --header 'Host: test.docker.local' 'http://localhost:80/' +```console +# $ curl --header 'Host:test.docker.localhost' 'http://localhost:80/' +$ curl 'http://test.docker.localhost' Hostname: 117c5530934d IP: 127.0.0.1 IP: ::1 IP: 172.17.0.3 IP: fe80::42:acff:fe11:3 GET / HTTP/1.1 -Host: 172.17.0.3:80 +Host: test.docker.localhost User-Agent: curl/7.35.0 Accept: */* Accept-Encoding: gzip @@ -104,16 +160,20 @@ X-Forwarded-For: 172.17.0.1 X-Forwarded-Host: 172.17.0.3:80 X-Forwarded-Proto: http X-Forwarded-Server: f2e05c433120 - ``` The web UI [http://localhost:8080](http://localhost:8080) will give you an overview of the frontends/backends and also a health dashboard. -![Web UI Providers](https://raw.githubusercontent.com/containous/traefik/master/docs/img/web.frontend.png) +![Web UI Providers](https://raw.githubusercontent.com/containous/traefik/v1.7/docs/img/web.frontend.png) # Documentation -You can find the complete documentation at [https://docs.traefik.io](https://docs.traefik.io). +You can find the complete documentation: + +- for [v1.7](https://docs.traefik.io/v1.7) +- for [v2.0](https://docs.traefik.io/v2.0) + +A community support is available at [https://community.containo.us](https://community.containo.us) A collection of contributions around Traefik can be found at [https://awesome.traefik.io](https://awesome.traefik.io). diff --git a/vault/README.md b/vault/README.md index fa678b847..442819e28 100644 --- a/vault/README.md +++ b/vault/README.md @@ -16,7 +16,7 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`1.2.2`, `latest`](https://github.com/hashicorp/docker-vault/blob/402f2e30796f5ab2dcbd414d5f910b4f3332384b/0.X/Dockerfile) +- [`1.2.3`, `latest`](https://github.com/hashicorp/docker-vault/blob/931be649e18a93b84da9c69ebbf41aaca5213090/0.X/Dockerfile) # Quick reference