diff --git a/chronograf/README.md b/chronograf/README.md index 4c32594fd..b4828397d 100644 --- a/chronograf/README.md +++ b/chronograf/README.md @@ -16,8 +16,8 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`1.3`, `1.3.1`, `1.3.1.0`, `latest` (*chronograf/1.3/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/2b0162afffdcfe83ca4a0e9da999f75a257c5bbe/chronograf/1.3/Dockerfile) -- [`1.3-alpine`, `1.3.1-alpine`, `1.3.1.0-alpine`, `alpine` (*chronograf/1.3/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/2b0162afffdcfe83ca4a0e9da999f75a257c5bbe/chronograf/1.3/alpine/Dockerfile) +- [`1.3`, `1.3.2`, `1.3.2.1`, `latest` (*chronograf/1.3/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/d3c9a9f5089a0370ee9dfbdb54f3e02ccde41593/chronograf/1.3/Dockerfile) +- [`1.3-alpine`, `1.3.2-alpine`, `1.3.2.1-alpine`, `alpine` (*chronograf/1.3/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/d3c9a9f5089a0370ee9dfbdb54f3e02ccde41593/chronograf/1.3/alpine/Dockerfile) # Quick reference diff --git a/debian/README.md b/debian/README.md index 0a784a350..a526bdd36 100644 --- a/debian/README.md +++ b/debian/README.md @@ -47,7 +47,7 @@ WARNING: [the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://blog.docker.com/2016/11/introducing-docker-community-directory-docker-community-slack/), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker) - **Where to file issues**: - [https://github.com/tianon/docker-brew-debian/issues](https://github.com/tianon/docker-brew-debian/issues) + [https://github.com/debuerreotype/docker-debian-artifacts/issues](https://github.com/debuerreotype/docker-debian-artifacts/issues) - **Maintained by**: Debian Developers [tianon](https://qa.debian.org/developer.php?login=tianon) and [paultag](https://qa.debian.org/developer.php?login=paultag) @@ -100,10 +100,10 @@ ENV LANG en_US.utf8 These tags are an experiment in providing a slimmer base (removing some extra files that are normally not necessary within containers, such as man pages and documentation), and are definitely subject to change. -See [the discussion in tianon/docker-brew-debian#48](https://github.com/tianon/docker-brew-debian/issues/48) for some notes/details regarding the specifics of the implementation. +See the `debuerreotype-slimify` script (`debuerreotype` linked below) for more details about what gets removed during the "slimification" process. ## How It's Made -If you are curious about what goes into creating this image, please see [`contrib/mkimage.sh` in `github.com/docker/docker`](https://github.com/docker/docker/blob/master/contrib/mkimage.sh) (and [`contrib/mkimage/debootstrap` in the same repo](https://github.com/docker/docker/blob/master/contrib/mkimage/debootstrap)). Those are invoked by [`update.sh` in the image repository](https://github.com/tianon/docker-brew-debian/blob/master/update.sh), which provides some additional functionality such as generating `-backports` contents and repacking the generated tarballs for the `-slim` variants. +The rootfs tarballs for this image are built using [the reproducible-Debian-rootfs tool, `debuerreotype`](https://github.com/debuerreotype/debuerreotype), with an explicit goal being that they are transparent and reproducible. Using the same toolchain, it should be possible to regenerate (clean-room!) the same tarballs used for building the official Debian images. -Additional interesting information is provided in files on the [relevant `dist` branch](https://github.com/tianon/docker-brew-debian/branches) of the image repository, namely the exact command used to build (`SUITE/build-command.txt`), a full log of the build itself (`SUITE/build.log`), and the "build manifest" (`SUITE/build.manifest`, which lists the version numbers of all the packages included in the rootfs tarball). +Additionally, the scripts in [https://github.com/debuerreotype/docker-debian-artifacts](https://github.com/debuerreotype/docker-debian-artifacts) are used to create each tag's `Dockerfile` and collect architecture-specific tarballs into a single place (for placement into [`dist-ARCH` branches on the same repository](https://github.com/debuerreotype/docker-debian-artifacts/branches), which also contain extra metadata about the artifacts included in each build, such as explicit package versions). diff --git a/hello-world/README.md b/hello-world/README.md index ced4aff79..77413fba9 100644 --- a/hello-world/README.md +++ b/hello-world/README.md @@ -72,7 +72,7 @@ For more examples and ideas, visit: $ docker images hello-world REPOSITORY TAG IMAGE ID SIZE -hello-world latest 48b5124b2768 1.84 kB +hello-world latest 48b5124b2768 1.84kB ``` ![logo](https://raw.githubusercontent.com/docker-library/docs/01c12653951b2fe592c1f93a13b4e289ada0e3a1/hello-world/logo.png) diff --git a/hello-world/content.md b/hello-world/content.md index 71b42522e..aeb2fbe2b 100644 --- a/hello-world/content.md +++ b/hello-world/content.md @@ -26,7 +26,7 @@ For more examples and ideas, visit: $ docker images hello-world REPOSITORY TAG IMAGE ID SIZE -hello-world latest 48b5124b2768 1.84 kB +hello-world latest 48b5124b2768 1.84kB ``` %%LOGO%%