diff --git a/eclipse-temurin/README.md b/eclipse-temurin/README.md index db9537ef3..244ab2c01 100644 --- a/eclipse-temurin/README.md +++ b/eclipse-temurin/README.md @@ -166,7 +166,7 @@ WARNING: # Quick reference (cont.) - **Where to file issues**: - [GitHub](https://github.com/adoptium/containers/issues); The [adoptium support](https://adoptium.net/support) page has more information on quality, roadmap and support levels for Eclipse Temurin builds. Vulnerabilities not related to Eclipse Temurin itself should be be raised to their retrosepctive projects (e.g Ubuntu vulnerabilities need to be raised directly to the Ubuntu project). + [GitHub](https://github.com/adoptium/containers/issues); The [adoptium support](https://adoptium.net/support) page has more information on quality, roadmap and support levels for Eclipse Temurin builds. Vulnerabilities not related to Eclipse Temurin itself should be be raised to their respective projects (e.g Ubuntu vulnerabilities need to be raised directly to the Ubuntu project). - **Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64)) [`amd64`](https://hub.docker.com/r/amd64/eclipse-temurin/), [`arm32v7`](https://hub.docker.com/r/arm32v7/eclipse-temurin/), [`arm64v8`](https://hub.docker.com/r/arm64v8/eclipse-temurin/), [`ppc64le`](https://hub.docker.com/r/ppc64le/eclipse-temurin/), [`s390x`](https://hub.docker.com/r/s390x/eclipse-temurin/), [`windows-amd64`](https://hub.docker.com/r/winamd64/eclipse-temurin/) diff --git a/telegraf/README.md b/telegraf/README.md index 138ac9a49..2fc0a38a6 100644 --- a/telegraf/README.md +++ b/telegraf/README.md @@ -24,12 +24,12 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`1.20`, `1.20.4`](https://github.com/influxdata/influxdata-docker/blob/219377ab12948e18a561fdc77caeace0892b8e15/telegraf/1.20/Dockerfile) -- [`1.20-alpine`, `1.20.4-alpine`](https://github.com/influxdata/influxdata-docker/blob/219377ab12948e18a561fdc77caeace0892b8e15/telegraf/1.20/alpine/Dockerfile) -- [`1.21`, `1.21.4`](https://github.com/influxdata/influxdata-docker/blob/219377ab12948e18a561fdc77caeace0892b8e15/telegraf/1.21/Dockerfile) -- [`1.21-alpine`, `1.21.4-alpine`](https://github.com/influxdata/influxdata-docker/blob/219377ab12948e18a561fdc77caeace0892b8e15/telegraf/1.21/alpine/Dockerfile) -- [`1.22`, `1.22.2`, `latest`](https://github.com/influxdata/influxdata-docker/blob/219377ab12948e18a561fdc77caeace0892b8e15/telegraf/1.22/Dockerfile) -- [`1.22-alpine`, `1.22.2-alpine`, `alpine`](https://github.com/influxdata/influxdata-docker/blob/219377ab12948e18a561fdc77caeace0892b8e15/telegraf/1.22/alpine/Dockerfile) +- [`1.20`, `1.20.4`](https://github.com/influxdata/influxdata-docker/blob/7278a22119bdaa7857870452d9f33b6c4fdedef7/telegraf/1.20/Dockerfile) +- [`1.20-alpine`, `1.20.4-alpine`](https://github.com/influxdata/influxdata-docker/blob/7278a22119bdaa7857870452d9f33b6c4fdedef7/telegraf/1.20/alpine/Dockerfile) +- [`1.21`, `1.21.4`](https://github.com/influxdata/influxdata-docker/blob/7278a22119bdaa7857870452d9f33b6c4fdedef7/telegraf/1.21/Dockerfile) +- [`1.21-alpine`, `1.21.4-alpine`](https://github.com/influxdata/influxdata-docker/blob/7278a22119bdaa7857870452d9f33b6c4fdedef7/telegraf/1.21/alpine/Dockerfile) +- [`1.22`, `1.22.3`, `latest`](https://github.com/influxdata/influxdata-docker/blob/7278a22119bdaa7857870452d9f33b6c4fdedef7/telegraf/1.22/Dockerfile) +- [`1.22-alpine`, `1.22.3-alpine`, `alpine`](https://github.com/influxdata/influxdata-docker/blob/7278a22119bdaa7857870452d9f33b6c4fdedef7/telegraf/1.22/alpine/Dockerfile) # Quick reference (cont.) diff --git a/varnish/README.md b/varnish/README.md index e0d3c210e..63ddb900c 100644 --- a/varnish/README.md +++ b/varnish/README.md @@ -166,6 +166,46 @@ $ docker run varnish varnishd -F -a :8080 -b 127.0.0.1:8181 -t 600 -p feature=+h As mentioned above, you can use [vmod_dynamic](https://github.com/nigoroll/libvmod-dynamic) for backend resolution. The [varnish-modules](https://github.com/varnish/varnish-modules) collection is also included in the image. All the documentation regarding usage and syntax can be found in the [src/](https://github.com/varnish/varnish-modules/tree/master/src) directory of the repository. +On top of this, images include [install-vmod](https://github.com/varnish/toolbox/tree/master/install-vmod), a helper script to quickly download, compile and install vmods while creating your own images. Note that images set the `ENV` variable `VMOD_DEPS` to ease the task further. + +### Debian + +```dockerfile +FROM varnish:7.1 + +# set the user to root, and install build dependencies +USER root +RUN set -e; \ + apt-get update; \ + apt-get -y install $VMOD_DEPS /pkgs/*.deb; \ + \ +# install one, possibly multiple vmods + install-vmod https://github.com/varnish/varnish-modules/releases/download/0.20.0/varnish-modules-0.20.0.tar.gz; \ + \ +# clean up and set the user back to varnish + apt-get -y purge --auto-remove $VMOD_DEPS varnish-dev; \ + rm -rf /var/lib/apt/lists/* +USER varnish +``` + +### Alpine + +```dockerfile +FROM varnish:7.1-alpine + +# install build dependencies +USER root +RUN set -e; \ + apk add --no-cache $VMOD_DEPS; \ + \ +# install one, possibly multiple vmods + install-vmod https://github.com/varnish/varnish-modules/releases/download/0.20.0/varnish-modules-0.20.0.tar.gz; \ + \ +# clean up + apk del --no-network $VMOD_DEPS +USER varnish +``` + # Image Variants The `varnish` images come in many flavors, each designed for a specific use case.