diff --git a/README.md b/README.md index d779581..1bbc847 100644 --- a/README.md +++ b/README.md @@ -2,26 +2,24 @@ ## Maintained by: [the Docker Community](https://github.com/docker-library/httpd) -This is the Git repo of the [Docker "Official Image"](https://docs.docker.com/docker-hub/official_repos/) for [httpd](https://hub.docker.com/_/httpd/) (not to be confused with any official httpd image provided by httpd upstream). See [the Docker Hub page](https://hub.docker.com/_/httpd/) for the full readme on how to use this Docker image and for information regarding contributing and issues. +This is the Git repo of the [Docker "Official Image"](https://github.com/docker-library/official-images#what-are-official-images) for [`httpd`](https://hub.docker.com/_/httpd/) (not to be confused with any official `httpd` image provided by `httpd` upstream). See [the Docker Hub page](https://hub.docker.com/_/httpd/) for the full readme on how to use this Docker image and for information regarding contributing and issues. -The [full description from Docker Hub](https://hub.docker.com/_/httpd/) is generated over in [docker-library/docs](https://github.com/docker-library/docs), specifically in [docker-library/docs/httpd](https://github.com/docker-library/docs/tree/master/httpd). +The [full image description on Docker Hub](https://hub.docker.com/_/httpd/) is generated/maintained over in [the docker-library/docs repository](https://github.com/docker-library/docs), specifically in [the `httpd` directory](https://github.com/docker-library/docs/tree/master/httpd). ## See a change merged here that doesn't show up on Docker Hub yet? -Check [the "library/httpd" manifest file in the docker-library/official-images repo](https://github.com/docker-library/official-images/blob/master/library/httpd), especially [PRs with the "library/httpd" label on that repo](https://github.com/docker-library/official-images/labels/library%2Fhttpd). +For more information about the full official images change lifecycle, see [the "An image's source changed in Git, now what?" FAQ entry](https://github.com/docker-library/faq#an-images-source-changed-in-git-now-what). -For more information about the official images process, see the [docker-library/official-images readme](https://github.com/docker-library/official-images/blob/master/README.md). +For outstanding `httpd` image PRs, check [PRs with the "library/httpd" label on the official-images repository](https://github.com/docker-library/official-images/labels/library%2Fhttpd). For the current "source of truth" for [`httpd`](https://hub.docker.com/_/httpd/), see [the `library/httpd` file in the official-images repository](https://github.com/docker-library/official-images/blob/master/library/httpd). --- -- [Travis CI: - ![build status badge](https://img.shields.io/travis/docker-library/httpd/master.svg)](https://travis-ci.org/docker-library/httpd/branches) -- [Automated `update.sh`: - ![build status badge](https://doi-janky.infosiftr.net/job/update.sh/job/httpd/badge/icon)](https://doi-janky.infosiftr.net/job/update.sh/job/httpd) +- [![build status badge](https://img.shields.io/travis/docker-library/httpd/master.svg?label=Travis%20CI)](https://travis-ci.org/docker-library/httpd/branches) +- [![build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/update.sh/job/httpd.svg?label=Automated%20update.sh)](https://doi-janky.infosiftr.net/job/update.sh/job/httpd) | Build | Status | Badges | (per-arch) | |:-:|:-:|:-:|:-:| -| [`amd64`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/httpd/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/httpd) | [`arm32v5`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/httpd/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/httpd) | [`arm32v6`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/httpd/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/httpd) | [`arm32v7`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/httpd/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/httpd) | -| [`arm64v8`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/httpd/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/httpd) | [`i386`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/httpd/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/httpd) | [`ppc64le`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/httpd/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/httpd) | [`s390x`
![build status badge](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/httpd/badge/icon)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/httpd) | +| [![amd64 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/amd64/job/httpd.svg?label=amd64)](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/httpd) | [![arm32v5 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/httpd.svg?label=arm32v5)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/httpd) | [![arm32v6 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/httpd.svg?label=arm32v6)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/httpd) | [![arm32v7 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/httpd.svg?label=arm32v7)](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/httpd) | +| [![arm64v8 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/httpd.svg?label=arm64v8)](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/httpd) | [![i386 build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/i386/job/httpd.svg?label=i386)](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/httpd) | [![ppc64le build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/httpd.svg?label=ppc64le)](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/httpd) | [![s390x build status badge](https://img.shields.io/jenkins/s/https/doi-janky.infosiftr.net/job/multiarch/job/s390x/job/httpd.svg?label=s390x)](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/httpd) |