{"action":"created","issue":{"url":"https://api.github.com/repos/docker-library/official-images/issues/4293","repository_url":"https://api.github.com/repos/docker-library/official-images","labels_url":"https://api.github.com/repos/docker-library/official-images/issues/4293/labels{/name}","comments_url":"https://api.github.com/repos/docker-library/official-images/issues/4293/comments","events_url":"https://api.github.com/repos/docker-library/official-images/issues/4293/events","html_url":"https://github.com/docker-library/official-images/pull/4293","id":318126923,"number":4293,"title":"Update docker-library images","user":{"login":"tianon","id":161631,"avatar_url":"https://avatars1.githubusercontent.com/u/161631?v=4","gravatar_id":"","url":"https://api.github.com/users/tianon","html_url":"https://github.com/tianon","followers_url":"https://api.github.com/users/tianon/followers","following_url":"https://api.github.com/users/tianon/following{/other_user}","gists_url":"https://api.github.com/users/tianon/gists{/gist_id}","starred_url":"https://api.github.com/users/tianon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tianon/subscriptions","organizations_url":"https://api.github.com/users/tianon/orgs","repos_url":"https://api.github.com/users/tianon/repos","events_url":"https://api.github.com/users/tianon/events{/privacy}","received_events_url":"https://api.github.com/users/tianon/received_events","type":"User","site_admin":false},"labels":[{"id":208414627,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/cassandra","name":"library/cassandra","color":"ededed","default":false},{"id":176881231,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/docker","name":"library/docker","color":"ededed","default":false},{"id":205399302,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/drupal","name":"library/drupal","color":"ededed","default":false},{"id":178928632,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/ghost","name":"library/ghost","color":"ededed","default":false},{"id":176657650,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/haproxy","name":"library/haproxy","color":"ededed","default":false},{"id":176657652,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/mariadb","name":"library/mariadb","color":"ededed","default":false},{"id":885544582,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/matomo","name":"library/matomo","color":"ededed","default":false},{"id":176657579,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/mongo","name":"library/mongo","color":"ededed","default":false},{"id":313714723,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/openjdk","name":"library/openjdk","color":"ededed","default":false},{"id":178916738,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/percona","name":"library/percona","color":"ededed","default":false},{"id":176657653,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/php","name":"library/php","color":"ededed","default":false},{"id":289513840,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/piwik","name":"library/piwik","color":"ededed","default":false},{"id":176657638,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/postgres","name":"library/postgres","color":"ededed","default":false},{"id":176657654,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/pypy","name":"library/pypy","color":"ededed","default":false},{"id":176657639,"url":"https://api.github.com/repos/docker-library/official-images/labels/library/python","name":"library/python","color":"ededed","default":false}],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":0,"created_at":"2018-04-26T17:29:52Z","updated_at":"2018-04-26T20:55:22Z","closed_at":null,"author_association":"OWNER","pull_request":{"url":"https://api.github.com/repos/docker-library/official-images/pulls/4293","html_url":"https://github.com/docker-library/official-images/pull/4293","diff_url":"https://github.com/docker-library/official-images/pull/4293.diff","patch_url":"https://github.com/docker-library/official-images/pull/4293.patch"},"body":"- `cassandra`: better IP detection (docker-library/cassandra#146)\n- `docker`: 18.03.1-ce, 18.05.0-ce-rc1\n- `drupal`: 8.5.3, 8.4.8, 7.59\n- `ghost`: 1.22.4\n- `haproxy`: better Lua install, stretch, Alpine 3.7 (docker-library/haproxy#63)\n- `mariadb`: `5.5.60+maria-1~wheezy`\n- `matomo`: `latest`\n- `mongo`: 3.7.7\n- `openjdk`: windows ojdkbuild 1.8.0.171-1\n- `percona`: `5.7.21-21-3.jessie`\n- `php`: 7.2.5, 7.0.30\n- `piwik`: `latest`\n- `postgres`: Debian Stretch (docker-library/postgres#437), Alpine 3.7 (docker-library/postgres#436)\n- `pypy`: pip 10.0.1 (docker-library/pypy#22)\n- `python`: fix Windows build via TLS 1.2 (docker-library/python#279), Python 2 `PYTHONIOENCODING=UTF-8` (docker-library/python#278)"},"comment":{"url":"https://api.github.com/repos/docker-library/official-images/issues/comments/384786044","html_url":"https://github.com/docker-library/official-images/pull/4293#issuecomment-384786044","issue_url":"https://api.github.com/repos/docker-library/official-images/issues/4293","id":384786044,"user":{"login":"tianon","id":161631,"avatar_url":"https://avatars1.githubusercontent.com/u/161631?v=4","gravatar_id":"","url":"https://api.github.com/users/tianon","html_url":"https://github.com/tianon","followers_url":"https://api.github.com/users/tianon/followers","following_url":"https://api.github.com/users/tianon/following{/other_user}","gists_url":"https://api.github.com/users/tianon/gists{/gist_id}","starred_url":"https://api.github.com/users/tianon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tianon/subscriptions","organizations_url":"https://api.github.com/users/tianon/orgs","repos_url":"https://api.github.com/users/tianon/repos","events_url":"https://api.github.com/users/tianon/events{/privacy}","received_events_url":"https://api.github.com/users/tianon/received_events","type":"User","site_admin":false},"created_at":"2018-04-26T20:55:22Z","updated_at":"2018-04-26T20:55:22Z","author_association":"OWNER","body":"<details>\r\n<summary>Diff:</summary>\r\n\r\n```diff\r\ndiff --git a/_bashbrew-arches b/_bashbrew-arches\r\nindex ecd2a03..6d57c7a 100644\r\n--- a/_bashbrew-arches\r\n+++ b/_bashbrew-arches\r\n@@ -40,21 +40,6 @@ docker:latest @ arm32v6\r\n docker:latest @ arm64v8\r\n docker:latest @ ppc64le\r\n docker:latest @ s390x\r\n-docker:rc @ amd64\r\n-docker:rc @ arm32v6\r\n-docker:rc @ arm64v8\r\n-docker:rc @ ppc64le\r\n-docker:rc @ s390x\r\n-docker:rc-dind @ amd64\r\n-docker:rc-dind @ arm32v6\r\n-docker:rc-dind @ arm64v8\r\n-docker:rc-dind @ ppc64le\r\n-docker:rc-dind @ s390x\r\n-docker:rc-git @ amd64\r\n-docker:rc-git @ arm32v6\r\n-docker:rc-git @ arm64v8\r\n-docker:rc-git @ ppc64le\r\n-docker:rc-git @ s390x\r\n docker:stable @ amd64\r\n docker:stable @ arm32v6\r\n docker:stable @ arm64v8\r\n@@ -70,6 +55,21 @@ docker:stable-git @ arm32v6\r\n docker:stable-git @ arm64v8\r\n docker:stable-git @ ppc64le\r\n docker:stable-git @ s390x\r\n+docker:test @ amd64\r\n+docker:test @ arm32v6\r\n+docker:test @ arm64v8\r\n+docker:test @ ppc64le\r\n+docker:test @ s390x\r\n+docker:test-dind @ amd64\r\n+docker:test-dind @ arm32v6\r\n+docker:test-dind @ arm64v8\r\n+docker:test-dind @ ppc64le\r\n+docker:test-dind @ s390x\r\n+docker:test-git @ amd64\r\n+docker:test-git @ arm32v6\r\n+docker:test-git @ arm64v8\r\n+docker:test-git @ ppc64le\r\n+docker:test-git @ s390x\r\n drupal:7 @ amd64\r\n drupal:7 @ arm32v5\r\n drupal:7 @ arm32v7\r\n@@ -162,6 +162,11 @@ haproxy:1.6 @ i386\r\n haproxy:1.6 @ ppc64le\r\n haproxy:1.6 @ s390x\r\n haproxy:1.6-alpine @ amd64\r\n+haproxy:1.6-alpine @ arm32v6\r\n+haproxy:1.6-alpine @ arm64v8\r\n+haproxy:1.6-alpine @ i386\r\n+haproxy:1.6-alpine @ ppc64le\r\n+haproxy:1.6-alpine @ s390x\r\n haproxy:1.7 @ amd64\r\n haproxy:1.7 @ arm32v5\r\n haproxy:1.7 @ arm32v7\r\n@@ -170,6 +175,11 @@ haproxy:1.7 @ i386\r\n haproxy:1.7 @ ppc64le\r\n haproxy:1.7 @ s390x\r\n haproxy:1.7-alpine @ amd64\r\n+haproxy:1.7-alpine @ arm32v6\r\n+haproxy:1.7-alpine @ arm64v8\r\n+haproxy:1.7-alpine @ i386\r\n+haproxy:1.7-alpine @ ppc64le\r\n+haproxy:1.7-alpine @ s390x\r\n haproxy:alpine @ amd64\r\n haproxy:alpine @ arm32v6\r\n haproxy:alpine @ arm64v8\r\n@@ -188,20 +198,20 @@ mariadb:10.0 @ amd64\r\n mariadb:10.1 @ amd64\r\n mariadb:10.3 @ amd64\r\n mariadb:latest @ amd64\r\n-matomo:3 @ amd64\r\n-matomo:3 @ arm32v5\r\n-matomo:3 @ arm32v7\r\n-matomo:3 @ arm64v8\r\n-matomo:3 @ i386\r\n-matomo:3 @ ppc64le\r\n-matomo:3 @ s390x\r\n-matomo:3-fpm @ amd64\r\n-matomo:3-fpm @ arm32v5\r\n-matomo:3-fpm @ arm32v7\r\n-matomo:3-fpm @ arm64v8\r\n-matomo:3-fpm @ i386\r\n-matomo:3-fpm @ ppc64le\r\n-matomo:3-fpm @ s390x\r\n+matomo:fpm @ amd64\r\n+matomo:fpm @ arm32v5\r\n+matomo:fpm @ arm32v7\r\n+matomo:fpm @ arm64v8\r\n+matomo:fpm @ i386\r\n+matomo:fpm @ ppc64le\r\n+matomo:fpm @ s390x\r\n+matomo:latest @ amd64\r\n+matomo:latest @ arm32v5\r\n+matomo:latest @ arm32v7\r\n+matomo:latest @ arm64v8\r\n+matomo:latest @ i386\r\n+matomo:latest @ ppc64le\r\n+matomo:latest @ s390x\r\n mongo:3.0-wheezy @ amd64\r\n mongo:3.2-jessie @ amd64\r\n mongo:3.4-jessie @ amd64\r\n@@ -527,20 +537,20 @@ php:zts-alpine @ arm32v6\r\n php:zts-alpine @ arm64v8\r\n php:zts-alpine @ i386\r\n php:zts-alpine @ ppc64le\r\n-piwik:3 @ amd64\r\n-piwik:3 @ arm32v5\r\n-piwik:3 @ arm32v7\r\n-piwik:3 @ arm64v8\r\n-piwik:3 @ i386\r\n-piwik:3 @ ppc64le\r\n-piwik:3 @ s390x\r\n-piwik:3-fpm @ amd64\r\n-piwik:3-fpm @ arm32v5\r\n-piwik:3-fpm @ arm32v7\r\n-piwik:3-fpm @ arm64v8\r\n-piwik:3-fpm @ i386\r\n-piwik:3-fpm @ ppc64le\r\n-piwik:3-fpm @ s390x\r\n+piwik:fpm @ amd64\r\n+piwik:fpm @ arm32v5\r\n+piwik:fpm @ arm32v7\r\n+piwik:fpm @ arm64v8\r\n+piwik:fpm @ i386\r\n+piwik:fpm @ ppc64le\r\n+piwik:fpm @ s390x\r\n+piwik:latest @ amd64\r\n+piwik:latest @ arm32v5\r\n+piwik:latest @ arm32v7\r\n+piwik:latest @ arm64v8\r\n+piwik:latest @ i386\r\n+piwik:latest @ ppc64le\r\n+piwik:latest @ s390x\r\n postgres:9 @ amd64\r\n postgres:9 @ arm32v5\r\n postgres:9 @ arm32v7\r\n@@ -549,6 +559,11 @@ postgres:9 @ i386\r\n postgres:9 @ ppc64le\r\n postgres:9 @ s390x\r\n postgres:9-alpine @ amd64\r\n+postgres:9-alpine @ arm32v6\r\n+postgres:9-alpine @ arm64v8\r\n+postgres:9-alpine @ i386\r\n+postgres:9-alpine @ ppc64le\r\n+postgres:9-alpine @ s390x\r\n postgres:9.3 @ amd64\r\n postgres:9.3 @ arm32v5\r\n postgres:9.3 @ arm32v7\r\n@@ -557,6 +572,11 @@ postgres:9.3 @ i386\r\n postgres:9.3 @ ppc64le\r\n postgres:9.3 @ s390x\r\n postgres:9.3-alpine @ amd64\r\n+postgres:9.3-alpine @ arm32v6\r\n+postgres:9.3-alpine @ arm64v8\r\n+postgres:9.3-alpine @ i386\r\n+postgres:9.3-alpine @ ppc64le\r\n+postgres:9.3-alpine @ s390x\r\n postgres:9.4 @ amd64\r\n postgres:9.4 @ arm32v5\r\n postgres:9.4 @ arm32v7\r\n@@ -565,6 +585,11 @@ postgres:9.4 @ i386\r\n postgres:9.4 @ ppc64le\r\n postgres:9.4 @ s390x\r\n postgres:9.4-alpine @ amd64\r\n+postgres:9.4-alpine @ arm32v6\r\n+postgres:9.4-alpine @ arm64v8\r\n+postgres:9.4-alpine @ i386\r\n+postgres:9.4-alpine @ ppc64le\r\n+postgres:9.4-alpine @ s390x\r\n postgres:9.5 @ amd64\r\n postgres:9.5 @ arm32v5\r\n postgres:9.5 @ arm32v7\r\n@@ -573,6 +598,11 @@ postgres:9.5 @ i386\r\n postgres:9.5 @ ppc64le\r\n postgres:9.5 @ s390x\r\n postgres:9.5-alpine @ amd64\r\n+postgres:9.5-alpine @ arm32v6\r\n+postgres:9.5-alpine @ arm64v8\r\n+postgres:9.5-alpine @ i386\r\n+postgres:9.5-alpine @ ppc64le\r\n+postgres:9.5-alpine @ s390x\r\n postgres:alpine @ amd64\r\n postgres:alpine @ arm32v6\r\n postgres:alpine @ arm64v8\r\ndiff --git a/_bashbrew-list b/_bashbrew-list\r\nindex 725d8b1..b4fa2b0 100644\r\n--- a/_bashbrew-list\r\n+++ b/_bashbrew-list\r\n@@ -27,18 +27,12 @@ docker:18-git\r\n docker:18.03\r\n docker:18.03-dind\r\n docker:18.03-git\r\n-docker:18.03-rc\r\n-docker:18.03-rc-dind\r\n-docker:18.03-rc-git\r\n-docker:18.03.0\r\n-docker:18.03.0-ce\r\n-docker:18.03.0-ce-dind\r\n-docker:18.03.0-ce-git\r\n-docker:18.03.0-dind\r\n-docker:18.03.0-git\r\n-docker:18.03.1-ce-rc2\r\n-docker:18.03.1-ce-rc2-dind\r\n-docker:18.03.1-ce-rc2-git\r\n+docker:18.03.1\r\n+docker:18.03.1-ce\r\n+docker:18.03.1-ce-dind\r\n+docker:18.03.1-ce-git\r\n+docker:18.03.1-dind\r\n+docker:18.03.1-git\r\n docker:18.04\r\n docker:18.04-dind\r\n docker:18.04-git\r\n@@ -48,6 +42,12 @@ docker:18.04.0-ce-dind\r\n docker:18.04.0-ce-git\r\n docker:18.04.0-dind\r\n docker:18.04.0-git\r\n+docker:18.05-rc\r\n+docker:18.05-rc-dind\r\n+docker:18.05-rc-git\r\n+docker:18.05.0-ce-rc1\r\n+docker:18.05.0-ce-rc1-dind\r\n+docker:18.05.0-ce-rc1-git\r\n docker:dind\r\n docker:edge\r\n docker:edge-dind\r\n@@ -67,10 +67,10 @@ drupal:7\r\n drupal:7-apache\r\n drupal:7-fpm\r\n drupal:7-fpm-alpine\r\n-drupal:7.58\r\n-drupal:7.58-apache\r\n-drupal:7.58-fpm\r\n-drupal:7.58-fpm-alpine\r\n+drupal:7.59\r\n+drupal:7.59-apache\r\n+drupal:7.59-fpm\r\n+drupal:7.59-fpm-alpine\r\n drupal:8\r\n drupal:8-apache\r\n drupal:8-fpm\r\n@@ -87,18 +87,18 @@ drupal:8.4\r\n drupal:8.4-apache\r\n drupal:8.4-fpm\r\n drupal:8.4-fpm-alpine\r\n-drupal:8.4.7\r\n-drupal:8.4.7-apache\r\n-drupal:8.4.7-fpm\r\n-drupal:8.4.7-fpm-alpine\r\n+drupal:8.4.8\r\n+drupal:8.4.8-apache\r\n+drupal:8.4.8-fpm\r\n+drupal:8.4.8-fpm-alpine\r\n drupal:8.5\r\n drupal:8.5-apache\r\n drupal:8.5-fpm\r\n drupal:8.5-fpm-alpine\r\n-drupal:8.5.2\r\n-drupal:8.5.2-apache\r\n-drupal:8.5.2-fpm\r\n-drupal:8.5.2-fpm-alpine\r\n+drupal:8.5.3\r\n+drupal:8.5.3-apache\r\n+drupal:8.5.3-fpm\r\n+drupal:8.5.3-fpm-alpine\r\n drupal:apache\r\n drupal:fpm\r\n drupal:fpm-alpine\r\n@@ -113,8 +113,8 @@ ghost:1\r\n ghost:1-alpine\r\n ghost:1.22\r\n ghost:1.22-alpine\r\n-ghost:1.22.3\r\n-ghost:1.22.3-alpine\r\n+ghost:1.22.4\r\n+ghost:1.22.4-alpine\r\n ghost:alpine\r\n ghost:latest\r\n haproxy:1\r\n@@ -139,7 +139,7 @@ haproxy:alpine\r\n haproxy:latest\r\n mariadb:5\r\n mariadb:5.5\r\n-mariadb:5.5.59\r\n+mariadb:5.5.60\r\n mariadb:10\r\n mariadb:10.0\r\n mariadb:10.0.34\r\n@@ -159,6 +159,9 @@ matomo:3.4-fpm\r\n matomo:3.4.0\r\n matomo:3.4.0-apache\r\n matomo:3.4.0-fpm\r\n+matomo:apache\r\n+matomo:fpm\r\n+matomo:latest\r\n mongo:3\r\n mongo:3-jessie\r\n mongo:3.0\r\n@@ -179,8 +182,8 @@ mongo:3.6.4\r\n mongo:3.6.4-jessie\r\n mongo:3.7\r\n mongo:3.7-jessie\r\n-mongo:3.7.5\r\n-mongo:3.7.5-jessie\r\n+mongo:3.7.7\r\n+mongo:3.7.7-jessie\r\n mongo:jessie\r\n mongo:latest\r\n mongo:unstable\r\n@@ -228,16 +231,6 @@ openjdk:8u151-jdk-alpine\r\n openjdk:8u151-jdk-alpine3.7\r\n openjdk:8u151-jre-alpine\r\n openjdk:8u151-jre-alpine3.7\r\n-openjdk:8u161-jdk-nanoserver\r\n-openjdk:8u161-jdk-nanoserver-sac2016\r\n-openjdk:8u161-jdk-windowsservercore\r\n-openjdk:8u161-jdk-windowsservercore-1709\r\n-openjdk:8u161-jdk-windowsservercore-ltsc2016\r\n-openjdk:8u161-nanoserver\r\n-openjdk:8u161-nanoserver-sac2016\r\n-openjdk:8u161-windowsservercore\r\n-openjdk:8u161-windowsservercore-1709\r\n-openjdk:8u161-windowsservercore-ltsc2016\r\n openjdk:8u162\r\n openjdk:8u162-jdk\r\n openjdk:8u162-jdk-slim\r\n@@ -250,6 +243,16 @@ openjdk:8u162-jre-stretch\r\n openjdk:8u162-slim\r\n openjdk:8u162-slim-stretch\r\n openjdk:8u162-stretch\r\n+openjdk:8u171-jdk-nanoserver\r\n+openjdk:8u171-jdk-nanoserver-sac2016\r\n+openjdk:8u171-jdk-windowsservercore\r\n+openjdk:8u171-jdk-windowsservercore-1709\r\n+openjdk:8u171-jdk-windowsservercore-ltsc2016\r\n+openjdk:8u171-nanoserver\r\n+openjdk:8u171-nanoserver-sac2016\r\n+openjdk:8u171-windowsservercore\r\n+openjdk:8u171-windowsservercore-1709\r\n+openjdk:8u171-windowsservercore-ltsc2016\r\n openjdk:8-alpine\r\n openjdk:8-alpine3.7\r\n openjdk:8-jdk\r\n@@ -569,24 +572,24 @@ php:7.0-zts\r\n php:7.0-zts-alpine\r\n php:7.0-zts-alpine3.4\r\n php:7.0-zts-jessie\r\n-php:7.0.29\r\n-php:7.0.29-alpine\r\n-php:7.0.29-alpine3.4\r\n-php:7.0.29-apache\r\n-php:7.0.29-apache-jessie\r\n-php:7.0.29-cli\r\n-php:7.0.29-cli-alpine\r\n-php:7.0.29-cli-alpine3.4\r\n-php:7.0.29-cli-jessie\r\n-php:7.0.29-fpm\r\n-php:7.0.29-fpm-alpine\r\n-php:7.0.29-fpm-alpine3.4\r\n-php:7.0.29-fpm-jessie\r\n-php:7.0.29-jessie\r\n-php:7.0.29-zts\r\n-php:7.0.29-zts-alpine\r\n-php:7.0.29-zts-alpine3.4\r\n-php:7.0.29-zts-jessie\r\n+php:7.0.30\r\n+php:7.0.30-alpine\r\n+php:7.0.30-alpine3.4\r\n+php:7.0.30-apache\r\n+php:7.0.30-apache-jessie\r\n+php:7.0.30-cli\r\n+php:7.0.30-cli-alpine\r\n+php:7.0.30-cli-alpine3.4\r\n+php:7.0.30-cli-jessie\r\n+php:7.0.30-fpm\r\n+php:7.0.30-fpm-alpine\r\n+php:7.0.30-fpm-alpine3.4\r\n+php:7.0.30-fpm-jessie\r\n+php:7.0.30-jessie\r\n+php:7.0.30-zts\r\n+php:7.0.30-zts-alpine\r\n+php:7.0.30-zts-alpine3.4\r\n+php:7.0.30-zts-jessie\r\n php:7.1\r\n php:7.1-alpine\r\n php:7.1-alpine3.4\r\n@@ -645,28 +648,28 @@ php:7.2-zts-alpine\r\n php:7.2-zts-alpine3.6\r\n php:7.2-zts-alpine3.7\r\n php:7.2-zts-stretch\r\n-php:7.2.4\r\n-php:7.2.4-alpine\r\n-php:7.2.4-alpine3.6\r\n-php:7.2.4-alpine3.7\r\n-php:7.2.4-apache\r\n-php:7.2.4-apache-stretch\r\n-php:7.2.4-cli\r\n-php:7.2.4-cli-alpine\r\n-php:7.2.4-cli-alpine3.6\r\n-php:7.2.4-cli-alpine3.7\r\n-php:7.2.4-cli-stretch\r\n-php:7.2.4-fpm\r\n-php:7.2.4-fpm-alpine\r\n-php:7.2.4-fpm-alpine3.6\r\n-php:7.2.4-fpm-alpine3.7\r\n-php:7.2.4-fpm-stretch\r\n-php:7.2.4-stretch\r\n-php:7.2.4-zts\r\n-php:7.2.4-zts-alpine\r\n-php:7.2.4-zts-alpine3.6\r\n-php:7.2.4-zts-alpine3.7\r\n-php:7.2.4-zts-stretch\r\n+php:7.2.5\r\n+php:7.2.5-alpine\r\n+php:7.2.5-alpine3.6\r\n+php:7.2.5-alpine3.7\r\n+php:7.2.5-apache\r\n+php:7.2.5-apache-stretch\r\n+php:7.2.5-cli\r\n+php:7.2.5-cli-alpine\r\n+php:7.2.5-cli-alpine3.6\r\n+php:7.2.5-cli-alpine3.7\r\n+php:7.2.5-cli-stretch\r\n+php:7.2.5-fpm\r\n+php:7.2.5-fpm-alpine\r\n+php:7.2.5-fpm-alpine3.6\r\n+php:7.2.5-fpm-alpine3.7\r\n+php:7.2.5-fpm-stretch\r\n+php:7.2.5-stretch\r\n+php:7.2.5-zts\r\n+php:7.2.5-zts-alpine\r\n+php:7.2.5-zts-alpine3.6\r\n+php:7.2.5-zts-alpine3.7\r\n+php:7.2.5-zts-stretch\r\n php:alpine\r\n php:alpine3.6\r\n php:alpine3.7\r\n@@ -698,6 +701,9 @@ piwik:3.4-fpm\r\n piwik:3.4.0\r\n piwik:3.4.0-apache\r\n piwik:3.4.0-fpm\r\n+piwik:apache\r\n+piwik:fpm\r\n+piwik:latest\r\n postgres:9\r\n postgres:9-alpine\r\n postgres:9.3\r\n@@ -723,20 +729,20 @@ postgres:10.3-alpine\r\n postgres:alpine\r\n postgres:latest\r\n pypy:2\r\n-pypy:2-5\r\n-pypy:2-5-slim\r\n-pypy:2-5.10\r\n-pypy:2-5.10-slim\r\n-pypy:2-5.10.0\r\n-pypy:2-5.10.0-slim\r\n+pypy:2-6\r\n+pypy:2-6-slim\r\n+pypy:2-6.0\r\n+pypy:2-6.0-slim\r\n+pypy:2-6.0.0\r\n+pypy:2-6.0.0-slim\r\n pypy:2-slim\r\n pypy:3\r\n-pypy:3-5\r\n-pypy:3-5-slim\r\n-pypy:3-5.10\r\n-pypy:3-5.10-slim\r\n-pypy:3-5.10.1\r\n-pypy:3-5.10.1-slim\r\n+pypy:3-6\r\n+pypy:3-6-slim\r\n+pypy:3-6.0\r\n+pypy:3-6.0-slim\r\n+pypy:3-6.0.0\r\n+pypy:3-6.0.0-slim\r\n pypy:3-slim\r\n pypy:latest\r\n pypy:slim\r\ndiff --git a/_bashbrew-shared-tags b/_bashbrew-shared-tags\r\nindex aded6c3..36fc87a 100644\r\n--- a/_bashbrew-shared-tags\r\n+++ b/_bashbrew-shared-tags\r\n@@ -8,13 +8,13 @@ mongo:3.4.14 -- mongo:3.4-jessie\r\n mongo:3.6 -- mongo:jessie\r\n mongo:3.6.4 -- mongo:jessie\r\n mongo:3.7 -- mongo:unstable-jessie\r\n-mongo:3.7.5 -- mongo:unstable-jessie\r\n+mongo:3.7.7 -- mongo:unstable-jessie\r\n mongo:latest -- mongo:jessie\r\n mongo:unstable -- mongo:unstable-jessie\r\n-openjdk:8u161-jdk-nanoserver -- openjdk:nanoserver-sac2016\r\n-openjdk:8u161-jdk-windowsservercore -- openjdk:windowsservercore-ltsc2016, openjdk:windowsservercore-1709\r\n-openjdk:8u161-nanoserver -- openjdk:nanoserver-sac2016\r\n-openjdk:8u161-windowsservercore -- openjdk:windowsservercore-ltsc2016, openjdk:windowsservercore-1709\r\n+openjdk:8u171-jdk-nanoserver -- openjdk:nanoserver-sac2016\r\n+openjdk:8u171-jdk-windowsservercore -- openjdk:windowsservercore-ltsc2016, openjdk:windowsservercore-1709\r\n+openjdk:8u171-nanoserver -- openjdk:nanoserver-sac2016\r\n+openjdk:8u171-windowsservercore -- openjdk:windowsservercore-ltsc2016, openjdk:windowsservercore-1709\r\n openjdk:8-jdk-nanoserver -- openjdk:nanoserver-sac2016\r\n openjdk:8-jdk-windowsservercore -- openjdk:windowsservercore-ltsc2016, openjdk:windowsservercore-1709\r\n openjdk:8-nanoserver -- openjdk:nanoserver-sac2016\r\ndiff --git a/cassandra_2.1/docker-entrypoint.sh b/cassandra_2.1/docker-entrypoint.sh\r\nindex 151adad..871f7f4 100755\r\n--- a/cassandra_2.1/docker-entrypoint.sh\r\n+++ b/cassandra_2.1/docker-entrypoint.sh\r\n@@ -13,18 +13,30 @@ if [ \"$1\" = 'cassandra' -a \"$(id -u)\" = '0' ]; then\r\n \texec gosu cassandra \"$BASH_SOURCE\" \"$@\"\r\n fi\r\n \r\n+_ip_address() {\r\n+\t# scrape the first non-localhost IP address of the container\r\n+\t# in Swarm Mode, we often get two IPs -- the container IP, and the (shared) VIP, and the container IP should always be first\r\n+\tip address | awk '\r\n+\t\t$1 == \"inet\" && $2 !~ /^127[.]/ {\r\n+\t\t\tgsub(/\\/.+$/, \"\", $2)\r\n+\t\t\tprint $2\r\n+\t\t\texit\r\n+\t\t}\r\n+\t'\r\n+}\r\n+\r\n if [ \"$1\" = 'cassandra' ]; then\r\n \t: ${CASSANDRA_RPC_ADDRESS='0.0.0.0'}\r\n \r\n \t: ${CASSANDRA_LISTEN_ADDRESS='auto'}\r\n \tif [ \"$CASSANDRA_LISTEN_ADDRESS\" = 'auto' ]; then\r\n-\t\tCASSANDRA_LISTEN_ADDRESS=\"$(hostname --ip-address)\"\r\n+\t\tCASSANDRA_LISTEN_ADDRESS=\"$(_ip_address)\"\r\n \tfi\r\n \r\n \t: ${CASSANDRA_BROADCAST_ADDRESS=\"$CASSANDRA_LISTEN_ADDRESS\"}\r\n \r\n \tif [ \"$CASSANDRA_BROADCAST_ADDRESS\" = 'auto' ]; then\r\n-\t\tCASSANDRA_BROADCAST_ADDRESS=\"$(hostname --ip-address)\"\r\n+\t\tCASSANDRA_BROADCAST_ADDRESS=\"$(_ip_address)\"\r\n \tfi\r\n \t: ${CASSANDRA_BROADCAST_RPC_ADDRESS:=$CASSANDRA_BROADCAST_ADDRESS}\r\n \r\ndiff --git a/cassandra_2/docker-entrypoint.sh b/cassandra_2/docker-entrypoint.sh\r\nindex 151adad..871f7f4 100755\r\n--- a/cassandra_2/docker-entrypoint.sh\r\n+++ b/cassandra_2/docker-entrypoint.sh\r\n@@ -13,18 +13,30 @@ if [ \"$1\" = 'cassandra' -a \"$(id -u)\" = '0' ]; then\r\n \texec gosu cassandra \"$BASH_SOURCE\" \"$@\"\r\n fi\r\n \r\n+_ip_address() {\r\n+\t# scrape the first non-localhost IP address of the container\r\n+\t# in Swarm Mode, we often get two IPs -- the container IP, and the (shared) VIP, and the container IP should always be first\r\n+\tip address | awk '\r\n+\t\t$1 == \"inet\" && $2 !~ /^127[.]/ {\r\n+\t\t\tgsub(/\\/.+$/, \"\", $2)\r\n+\t\t\tprint $2\r\n+\t\t\texit\r\n+\t\t}\r\n+\t'\r\n+}\r\n+\r\n if [ \"$1\" = 'cassandra' ]; then\r\n \t: ${CASSANDRA_RPC_ADDRESS='0.0.0.0'}\r\n \r\n \t: ${CASSANDRA_LISTEN_ADDRESS='auto'}\r\n \tif [ \"$CASSANDRA_LISTEN_ADDRESS\" = 'auto' ]; then\r\n-\t\tCASSANDRA_LISTEN_ADDRESS=\"$(hostname --ip-address)\"\r\n+\t\tCASSANDRA_LISTEN_ADDRESS=\"$(_ip_address)\"\r\n \tfi\r\n \r\n \t: ${CASSANDRA_BROADCAST_ADDRESS=\"$CASSANDRA_LISTEN_ADDRESS\"}\r\n \r\n \tif [ \"$CASSANDRA_BROADCAST_ADDRESS\" = 'auto' ]; then\r\n-\t\tCASSANDRA_BROADCAST_ADDRESS=\"$(hostname --ip-address)\"\r\n+\t\tCASSANDRA_BROADCAST_ADDRESS=\"$(_ip_address)\"\r\n \tfi\r\n \t: ${CASSANDRA_BROADCAST_RPC_ADDRESS:=$CASSANDRA_BROADCAST_ADDRESS}\r\n \r\ndiff --git a/cassandra_3.0/docker-entrypoint.sh b/cassandra_3.0/docker-entrypoint.sh\r\nindex 151adad..871f7f4 100755\r\n--- a/cassandra_3.0/docker-entrypoint.sh\r\n+++ b/cassandra_3.0/docker-entrypoint.sh\r\n@@ -13,18 +13,30 @@ if [ \"$1\" = 'cassandra' -a \"$(id -u)\" = '0' ]; then\r\n \texec gosu cassandra \"$BASH_SOURCE\" \"$@\"\r\n fi\r\n \r\n+_ip_address() {\r\n+\t# scrape the first non-localhost IP address of the container\r\n+\t# in Swarm Mode, we often get two IPs -- the container IP, and the (shared) VIP, and the container IP should always be first\r\n+\tip address | awk '\r\n+\t\t$1 == \"inet\" && $2 !~ /^127[.]/ {\r\n+\t\t\tgsub(/\\/.+$/, \"\", $2)\r\n+\t\t\tprint $2\r\n+\t\t\texit\r\n+\t\t}\r\n+\t'\r\n+}\r\n+\r\n if [ \"$1\" = 'cassandra' ]; then\r\n \t: ${CASSANDRA_RPC_ADDRESS='0.0.0.0'}\r\n \r\n \t: ${CASSANDRA_LISTEN_ADDRESS='auto'}\r\n \tif [ \"$CASSANDRA_LISTEN_ADDRESS\" = 'auto' ]; then\r\n-\t\tCASSANDRA_LISTEN_ADDRESS=\"$(hostname --ip-address)\"\r\n+\t\tCASSANDRA_LISTEN_ADDRESS=\"$(_ip_address)\"\r\n \tfi\r\n \r\n \t: ${CASSANDRA_BROADCAST_ADDRESS=\"$CASSANDRA_LISTEN_ADDRESS\"}\r\n \r\n \tif [ \"$CASSANDRA_BROADCAST_ADDRESS\" = 'auto' ]; then\r\n-\t\tCASSANDRA_BROADCAST_ADDRESS=\"$(hostname --ip-address)\"\r\n+\t\tCASSANDRA_BROADCAST_ADDRESS=\"$(_ip_address)\"\r\n \tfi\r\n \t: ${CASSANDRA_BROADCAST_RPC_ADDRESS:=$CASSANDRA_BROADCAST_ADDRESS}\r\n \r\ndiff --git a/cassandra_latest/docker-entrypoint.sh b/cassandra_latest/docker-entrypoint.sh\r\nindex 151adad..871f7f4 100755\r\n--- a/cassandra_latest/docker-entrypoint.sh\r\n+++ b/cassandra_latest/docker-entrypoint.sh\r\n@@ -13,18 +13,30 @@ if [ \"$1\" = 'cassandra' -a \"$(id -u)\" = '0' ]; then\r\n \texec gosu cassandra \"$BASH_SOURCE\" \"$@\"\r\n fi\r\n \r\n+_ip_address() {\r\n+\t# scrape the first non-localhost IP address of the container\r\n+\t# in Swarm Mode, we often get two IPs -- the container IP, and the (shared) VIP, and the container IP should always be first\r\n+\tip address | awk '\r\n+\t\t$1 == \"inet\" && $2 !~ /^127[.]/ {\r\n+\t\t\tgsub(/\\/.+$/, \"\", $2)\r\n+\t\t\tprint $2\r\n+\t\t\texit\r\n+\t\t}\r\n+\t'\r\n+}\r\n+\r\n if [ \"$1\" = 'cassandra' ]; then\r\n \t: ${CASSANDRA_RPC_ADDRESS='0.0.0.0'}\r\n \r\n \t: ${CASSANDRA_LISTEN_ADDRESS='auto'}\r\n \tif [ \"$CASSANDRA_LISTEN_ADDRESS\" = 'auto' ]; then\r\n-\t\tCASSANDRA_LISTEN_ADDRESS=\"$(hostname --ip-address)\"\r\n+\t\tCASSANDRA_LISTEN_ADDRESS=\"$(_ip_address)\"\r\n \tfi\r\n \r\n \t: ${CASSANDRA_BROADCAST_ADDRESS=\"$CASSANDRA_LISTEN_ADDRESS\"}\r\n \r\n \tif [ \"$CASSANDRA_BROADCAST_ADDRESS\" = 'auto' ]; then\r\n-\t\tCASSANDRA_BROADCAST_ADDRESS=\"$(hostname --ip-address)\"\r\n+\t\tCASSANDRA_BROADCAST_ADDRESS=\"$(_ip_address)\"\r\n \tfi\r\n \t: ${CASSANDRA_BROADCAST_RPC_ADDRESS:=$CASSANDRA_BROADCAST_ADDRESS}\r\n \r\ndiff --git a/docker_stable/Dockerfile b/docker_stable/Dockerfile\r\nindex 30c4732..b94860a 100644\r\n--- a/docker_stable/Dockerfile\r\n+++ b/docker_stable/Dockerfile\r\n@@ -10,7 +10,7 @@ RUN apk add --no-cache \\\r\n RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf\r\n \r\n ENV DOCKER_CHANNEL stable\r\n-ENV DOCKER_VERSION 18.03.0-ce\r\n+ENV DOCKER_VERSION 18.03.1-ce\r\n # TODO ENV DOCKER_SHA256\r\n # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!\r\n # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)\r\ndiff --git a/docker_rc-dind/Dockerfile b/docker_test-dind/Dockerfile\r\nsimilarity index 98%\r\nrename from docker_rc-dind/Dockerfile\r\nrename to docker_test-dind/Dockerfile\r\nindex d45b602..352558b 100644\r\n--- a/docker_rc-dind/Dockerfile\r\n+++ b/docker_test-dind/Dockerfile\r\n@@ -1,4 +1,4 @@\r\n-FROM docker:18.03-rc\r\n+FROM docker:18.05-rc\r\n \r\n # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies\r\n RUN set -eux; \\\r\ndiff --git a/docker_rc-dind/dockerd-entrypoint.sh b/docker_test-dind/dockerd-entrypoint.sh\r\nsimilarity index 100%\r\nrename from docker_rc-dind/dockerd-entrypoint.sh\r\nrename to docker_test-dind/dockerd-entrypoint.sh\r\ndiff --git a/docker_rc-git/Dockerfile b/docker_test-git/Dockerfile\r\nsimilarity index 70%\r\nrename from docker_rc-git/Dockerfile\r\nrename to docker_test-git/Dockerfile\r\nindex 3db88d3..57ec343 100644\r\n--- a/docker_rc-git/Dockerfile\r\n+++ b/docker_test-git/Dockerfile\r\n@@ -1,4 +1,4 @@\r\n-FROM docker:18.03-rc\r\n+FROM docker:18.05-rc\r\n \r\n RUN apk add --no-cache \\\r\n \t\tgit \\\r\ndiff --git a/docker_rc/Dockerfile b/docker_test/Dockerfile\r\nsimilarity index 98%\r\nrename from docker_rc/Dockerfile\r\nrename to docker_test/Dockerfile\r\nindex c2273b4..12f7513 100644\r\n--- a/docker_rc/Dockerfile\r\n+++ b/docker_test/Dockerfile\r\n@@ -10,7 +10,7 @@ RUN apk add --no-cache \\\r\n RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf\r\n \r\n ENV DOCKER_CHANNEL test\r\n-ENV DOCKER_VERSION 18.03.1-ce-rc2\r\n+ENV DOCKER_VERSION 18.05.0-ce-rc1\r\n # TODO ENV DOCKER_SHA256\r\n # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!\r\n # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)\r\ndiff --git a/docker_rc/docker-entrypoint.sh b/docker_test/docker-entrypoint.sh\r\nsimilarity index 100%\r\nrename from docker_rc/docker-entrypoint.sh\r\nrename to docker_test/docker-entrypoint.sh\r\ndiff --git a/docker_rc/modprobe.sh b/docker_test/modprobe.sh\r\nsimilarity index 100%\r\nrename from docker_rc/modprobe.sh\r\nrename to docker_test/modprobe.sh\r\ndiff --git a/drupal_7-fpm-alpine/Dockerfile b/drupal_7-fpm-alpine/Dockerfile\r\nindex 8eb99bd..0f965c5 100644\r\n--- a/drupal_7-fpm-alpine/Dockerfile\r\n+++ b/drupal_7-fpm-alpine/Dockerfile\r\n@@ -43,8 +43,8 @@ RUN { \\\r\n WORKDIR /var/www/html\r\n \r\n # https://www.drupal.org/node/3060/release\r\n-ENV DRUPAL_VERSION 7.58\r\n-ENV DRUPAL_MD5 c59949bcfd0d68b4f272bc05a91d4dc6\r\n+ENV DRUPAL_VERSION 7.59\r\n+ENV DRUPAL_MD5 7e09c6b177345a81439fe0aa9a2d15fc\r\n \r\n RUN curl -fSL \"https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz\" -o drupal.tar.gz \\\r\n \t&& echo \"${DRUPAL_MD5} *drupal.tar.gz\" | md5sum -c - \\\r\ndiff --git a/drupal_7-fpm/Dockerfile b/drupal_7-fpm/Dockerfile\r\nindex 989ef9f..5c3e002 100644\r\n--- a/drupal_7-fpm/Dockerfile\r\n+++ b/drupal_7-fpm/Dockerfile\r\n@@ -54,8 +54,8 @@ RUN { \\\r\n WORKDIR /var/www/html\r\n \r\n # https://www.drupal.org/node/3060/release\r\n-ENV DRUPAL_VERSION 7.58\r\n-ENV DRUPAL_MD5 c59949bcfd0d68b4f272bc05a91d4dc6\r\n+ENV DRUPAL_VERSION 7.59\r\n+ENV DRUPAL_MD5 7e09c6b177345a81439fe0aa9a2d15fc\r\n \r\n RUN curl -fSL \"https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz\" -o drupal.tar.gz \\\r\n \t&& echo \"${DRUPAL_MD5} *drupal.tar.gz\" | md5sum -c - \\\r\ndiff --git a/drupal_7/Dockerfile b/drupal_7/Dockerfile\r\nindex 58a78fc..99e1d85 100644\r\n--- a/drupal_7/Dockerfile\r\n+++ b/drupal_7/Dockerfile\r\n@@ -54,8 +54,8 @@ RUN { \\\r\n WORKDIR /var/www/html\r\n \r\n # https://www.drupal.org/node/3060/release\r\n-ENV DRUPAL_VERSION 7.58\r\n-ENV DRUPAL_MD5 c59949bcfd0d68b4f272bc05a91d4dc6\r\n+ENV DRUPAL_VERSION 7.59\r\n+ENV DRUPAL_MD5 7e09c6b177345a81439fe0aa9a2d15fc\r\n \r\n RUN curl -fSL \"https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz\" -o drupal.tar.gz \\\r\n \t&& echo \"${DRUPAL_MD5} *drupal.tar.gz\" | md5sum -c - \\\r\ndiff --git a/drupal_8.4-fpm-alpine/Dockerfile b/drupal_8.4-fpm-alpine/Dockerfile\r\nindex 1db711f..b72da83 100644\r\n--- a/drupal_8.4-fpm-alpine/Dockerfile\r\n+++ b/drupal_8.4-fpm-alpine/Dockerfile\r\n@@ -43,8 +43,8 @@ RUN { \\\r\n WORKDIR /var/www/html\r\n \r\n # https://www.drupal.org/node/3060/release\r\n-ENV DRUPAL_VERSION 8.4.7\r\n-ENV DRUPAL_MD5 965b59360079fab9020fffce8c09a994\r\n+ENV DRUPAL_VERSION 8.4.8\r\n+ENV DRUPAL_MD5 f922c5fead1e05ecf155cfd63983fcf1\r\n \r\n RUN curl -fSL \"https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz\" -o drupal.tar.gz \\\r\n \t&& echo \"${DRUPAL_MD5} *drupal.tar.gz\" | md5sum -c - \\\r\ndiff --git a/drupal_8.4-fpm/Dockerfile b/drupal_8.4-fpm/Dockerfile\r\nindex 60ae5f3..15f98bd 100644\r\n--- a/drupal_8.4-fpm/Dockerfile\r\n+++ b/drupal_8.4-fpm/Dockerfile\r\n@@ -54,8 +54,8 @@ RUN { \\\r\n WORKDIR /var/www/html\r\n \r\n # https://www.drupal.org/node/3060/release\r\n-ENV DRUPAL_VERSION 8.4.7\r\n-ENV DRUPAL_MD5 965b59360079fab9020fffce8c09a994\r\n+ENV DRUPAL_VERSION 8.4.8\r\n+ENV DRUPAL_MD5 f922c5fead1e05ecf155cfd63983fcf1\r\n \r\n RUN curl -fSL \"https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz\" -o drupal.tar.gz \\\r\n \t&& echo \"${DRUPAL_MD5} *drupal.tar.gz\" | md5sum -c - \\\r\ndiff --git a/drupal_8.4/Dockerfile b/drupal_8.4/Dockerfile\r\nindex ebf2c32..a25fad7 100644\r\n--- a/drupal_8.4/Dockerfile\r\n+++ b/drupal_8.4/Dockerfile\r\n@@ -54,8 +54,8 @@ RUN { \\\r\n WORKDIR /var/www/html\r\n \r\n # https://www.drupal.org/node/3060/release\r\n-ENV DRUPAL_VERSION 8.4.7\r\n-ENV DRUPAL_MD5 965b59360079fab9020fffce8c09a994\r\n+ENV DRUPAL_VERSION 8.4.8\r\n+ENV DRUPAL_MD5 f922c5fead1e05ecf155cfd63983fcf1\r\n \r\n RUN curl -fSL \"https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz\" -o drupal.tar.gz \\\r\n \t&& echo \"${DRUPAL_MD5} *drupal.tar.gz\" | md5sum -c - \\\r\ndiff --git a/drupal_fpm-alpine/Dockerfile b/drupal_fpm-alpine/Dockerfile\r\nindex a077b9d..f2272db 100644\r\n--- a/drupal_fpm-alpine/Dockerfile\r\n+++ b/drupal_fpm-alpine/Dockerfile\r\n@@ -43,8 +43,8 @@ RUN { \\\r\n WORKDIR /var/www/html\r\n \r\n # https://www.drupal.org/node/3060/release\r\n-ENV DRUPAL_VERSION 8.5.2\r\n-ENV DRUPAL_MD5 c85c6ec800100d458fad6b9469e2fd8b\r\n+ENV DRUPAL_VERSION 8.5.3\r\n+ENV DRUPAL_MD5 aedc6598b71c5393d30242b8e14385e5\r\n \r\n RUN curl -fSL \"https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz\" -o drupal.tar.gz \\\r\n \t&& echo \"${DRUPAL_MD5} *drupal.tar.gz\" | md5sum -c - \\\r\ndiff --git a/drupal_fpm/Dockerfile b/drupal_fpm/Dockerfile\r\nindex 8faa09a..7360547 100644\r\n--- a/drupal_fpm/Dockerfile\r\n+++ b/drupal_fpm/Dockerfile\r\n@@ -54,8 +54,8 @@ RUN { \\\r\n WORKDIR /var/www/html\r\n \r\n # https://www.drupal.org/node/3060/release\r\n-ENV DRUPAL_VERSION 8.5.2\r\n-ENV DRUPAL_MD5 c85c6ec800100d458fad6b9469e2fd8b\r\n+ENV DRUPAL_VERSION 8.5.3\r\n+ENV DRUPAL_MD5 aedc6598b71c5393d30242b8e14385e5\r\n \r\n RUN curl -fSL \"https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz\" -o drupal.tar.gz \\\r\n \t&& echo \"${DRUPAL_MD5} *drupal.tar.gz\" | md5sum -c - \\\r\ndiff --git a/drupal_latest/Dockerfile b/drupal_latest/Dockerfile\r\nindex 40838e6..f81a791 100644\r\n--- a/drupal_latest/Dockerfile\r\n+++ b/drupal_latest/Dockerfile\r\n@@ -54,8 +54,8 @@ RUN { \\\r\n WORKDIR /var/www/html\r\n \r\n # https://www.drupal.org/node/3060/release\r\n-ENV DRUPAL_VERSION 8.5.2\r\n-ENV DRUPAL_MD5 c85c6ec800100d458fad6b9469e2fd8b\r\n+ENV DRUPAL_VERSION 8.5.3\r\n+ENV DRUPAL_MD5 aedc6598b71c5393d30242b8e14385e5\r\n \r\n RUN curl -fSL \"https://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz\" -o drupal.tar.gz \\\r\n \t&& echo \"${DRUPAL_MD5} *drupal.tar.gz\" | md5sum -c - \\\r\ndiff --git a/ghost_alpine/Dockerfile b/ghost_alpine/Dockerfile\r\nindex 7f0cbd9..b1f1491 100644\r\n--- a/ghost_alpine/Dockerfile\r\n+++ b/ghost_alpine/Dockerfile\r\n@@ -17,7 +17,7 @@ RUN npm install -g \"ghost-cli@$GHOST_CLI_VERSION\"\r\n ENV GHOST_INSTALL /var/lib/ghost\r\n ENV GHOST_CONTENT /var/lib/ghost/content\r\n \r\n-ENV GHOST_VERSION 1.22.3\r\n+ENV GHOST_VERSION 1.22.4\r\n \r\n RUN set -ex; \\\r\n \tmkdir -p \"$GHOST_INSTALL\"; \\\r\ndiff --git a/ghost_latest/Dockerfile b/ghost_latest/Dockerfile\r\nindex 981fe02..cff0205 100644\r\n--- a/ghost_latest/Dockerfile\r\n+++ b/ghost_latest/Dockerfile\r\n@@ -22,7 +22,7 @@ RUN npm install -g \"ghost-cli@$GHOST_CLI_VERSION\"\r\n ENV GHOST_INSTALL /var/lib/ghost\r\n ENV GHOST_CONTENT /var/lib/ghost/content\r\n \r\n-ENV GHOST_VERSION 1.22.3\r\n+ENV GHOST_VERSION 1.22.4\r\n \r\n RUN set -ex; \\\r\n \tmkdir -p \"$GHOST_INSTALL\"; \\\r\ndiff --git a/haproxy_1.5-alpine/Dockerfile b/haproxy_1.5-alpine/Dockerfile\r\nindex 11c2bcd..16afc05 100644\r\n--- a/haproxy_1.5-alpine/Dockerfile\r\n+++ b/haproxy_1.5-alpine/Dockerfile\r\n@@ -1,37 +1,46 @@\r\n+# vim:set ft=dockerfile:\r\n FROM alpine:3.5\r\n \r\n ENV HAPROXY_MAJOR 1.5\r\n ENV HAPROXY_VERSION 1.5.19\r\n ENV HAPROXY_MD5 74d49316f00e1fd9859bcac84ab04b5c\r\n \r\n-# see https://sources.debian.net/src/haproxy/1.5.8-1/debian/rules/ for some helpful navigation of the possible \"make\" arguments\r\n+# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible \"make\" arguments\r\n RUN set -x \\\r\n+\t\\\r\n \t&& apk add --no-cache --virtual .build-deps \\\r\n \t\tca-certificates \\\r\n-\t\tcurl \\\r\n \t\tgcc \\\r\n \t\tlibc-dev \\\r\n \t\tlinux-headers \\\r\n \t\tmake \\\r\n+\t\topenssl \\\r\n \t\topenssl-dev \\\r\n \t\tpcre-dev \\\r\n+\t\treadline-dev \\\r\n+\t\ttar \\\r\n \t\tzlib-dev \\\r\n-\t&& curl -SL \"https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz\" -o haproxy.tar.gz \\\r\n-\t&& echo \"${HAPROXY_MD5}  haproxy.tar.gz\" | md5sum -c \\\r\n-\t&& mkdir -p /usr/src \\\r\n-\t&& tar -xzf haproxy.tar.gz -C /usr/src \\\r\n-\t&& mv \"/usr/src/haproxy-$HAPROXY_VERSION\" /usr/src/haproxy \\\r\n+\t\\\r\n+# install HAProxy\r\n+\t&& wget -O haproxy.tar.gz \"https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz\" \\\r\n+\t&& echo \"$HAPROXY_MD5 *haproxy.tar.gz\" | md5sum -c \\\r\n+\t&& mkdir -p /usr/src/haproxy \\\r\n+\t&& tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1 \\\r\n \t&& rm haproxy.tar.gz \\\r\n-\t&& make -C /usr/src/haproxy \\\r\n+\t\\\r\n+\t&& makeOpts=' \\\r\n \t\tTARGET=linux2628 \\\r\n-\t\tUSE_PCRE=1 PCREDIR= \\\r\n \t\tUSE_OPENSSL=1 \\\r\n+\t\tUSE_PCRE=1 PCREDIR= \\\r\n \t\tUSE_ZLIB=1 \\\r\n-\t\tall \\\r\n-\t\tinstall-bin \\\r\n+\t' \\\r\n+\t&& make -C /usr/src/haproxy -j \"$(getconf _NPROCESSORS_ONLN)\" all $makeOpts \\\r\n+\t&& make -C /usr/src/haproxy install-bin $makeOpts \\\r\n+\t\\\r\n \t&& mkdir -p /usr/local/etc/haproxy \\\r\n \t&& cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \\\r\n \t&& rm -rf /usr/src/haproxy \\\r\n+\t\\\r\n \t&& runDeps=\"$( \\\r\n \t\tscanelf --needed --nobanner --format '%n#p' --recursive /usr/local \\\r\n \t\t\t| tr ',' '\\n' \\\r\ndiff --git a/haproxy_1.5/Dockerfile b/haproxy_1.5/Dockerfile\r\nindex 58e27ac..1b3d6a6 100644\r\n--- a/haproxy_1.5/Dockerfile\r\n+++ b/haproxy_1.5/Dockerfile\r\n@@ -1,30 +1,50 @@\r\n+# vim:set ft=dockerfile:\r\n FROM debian:jessie\r\n \r\n-RUN apt-get update && apt-get install -y libssl1.0.0 libpcre3 --no-install-recommends && rm -rf /var/lib/apt/lists/*\r\n+RUN apt-get update \\\r\n+\t&& apt-get install -y --no-install-recommends \\\r\n+\t\tlibpcre3 \\\r\n+\t\tlibssl1.0.0 \\\r\n+\t&& rm -rf /var/lib/apt/lists/*\r\n \r\n ENV HAPROXY_MAJOR 1.5\r\n ENV HAPROXY_VERSION 1.5.19\r\n ENV HAPROXY_MD5 74d49316f00e1fd9859bcac84ab04b5c\r\n \r\n-# see https://sources.debian.net/src/haproxy/1.5.8-1/debian/rules/ for some helpful navigation of the possible \"make\" arguments\r\n-RUN buildDeps='ca-certificates curl gcc libc6-dev libpcre3-dev libssl-dev make' \\\r\n-\t&& set -x \\\r\n+# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible \"make\" arguments\r\n+RUN set -x \\\r\n+\t\\\r\n+\t&& buildDeps=' \\\r\n+\t\tca-certificates \\\r\n+\t\tgcc \\\r\n+\t\tlibc6-dev \\\r\n+\t\tlibpcre3-dev \\\r\n+\t\tlibssl-dev \\\r\n+\t\tmake \\\r\n+\t\twget \\\r\n+\t\tzlib1g-dev \\\r\n+\t' \\\r\n \t&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \\\r\n-\t&& curl -SL \"https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz\" -o haproxy.tar.gz \\\r\n-\t&& echo \"${HAPROXY_MD5}  haproxy.tar.gz\" | md5sum -c \\\r\n+\t\\\r\n+\t&& wget -O haproxy.tar.gz \"https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz\" \\\r\n+\t&& echo \"$HAPROXY_MD5 *haproxy.tar.gz\" | md5sum -c \\\r\n \t&& mkdir -p /usr/src/haproxy \\\r\n \t&& tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1 \\\r\n \t&& rm haproxy.tar.gz \\\r\n-\t&& make -C /usr/src/haproxy \\\r\n+\t\\\r\n+\t&& makeOpts=' \\\r\n \t\tTARGET=linux2628 \\\r\n-\t\tUSE_PCRE=1 PCREDIR= \\\r\n \t\tUSE_OPENSSL=1 \\\r\n+\t\tUSE_PCRE=1 PCREDIR= \\\r\n \t\tUSE_ZLIB=1 \\\r\n-\t\tall \\\r\n-\t\tinstall-bin \\\r\n+\t' \\\r\n+\t&& make -C /usr/src/haproxy -j \"$(nproc)\" all $makeOpts \\\r\n+\t&& make -C /usr/src/haproxy install-bin $makeOpts \\\r\n+\t\\\r\n \t&& mkdir -p /usr/local/etc/haproxy \\\r\n \t&& cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \\\r\n \t&& rm -rf /usr/src/haproxy \\\r\n+\t\\\r\n \t&& apt-get purge -y --auto-remove $buildDeps\r\n \r\n COPY docker-entrypoint.sh /\r\ndiff --git a/haproxy_1.6-alpine/Dockerfile b/haproxy_1.6-alpine/Dockerfile\r\nindex 4f2e5bc..92901da 100644\r\n--- a/haproxy_1.6-alpine/Dockerfile\r\n+++ b/haproxy_1.6-alpine/Dockerfile\r\n@@ -1,13 +1,10 @@\r\n-FROM alpine:3.5\r\n+# vim:set ft=dockerfile:\r\n+FROM alpine:3.7\r\n \r\n ENV HAPROXY_MAJOR 1.6\r\n ENV HAPROXY_VERSION 1.6.14\r\n ENV HAPROXY_MD5 5daf73eb70052e8ec66c40817f265202\r\n \r\n-# https://www.lua.org/ftp/#source\r\n-ENV LUA_VERSION=5.3.4 \\\r\n-\tLUA_SHA1=79790cfd40e09ba796b01a571d4d63b52b1cd950\r\n-\r\n # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible \"make\" arguments\r\n RUN set -x \\\r\n \t\\\r\n@@ -16,6 +13,7 @@ RUN set -x \\\r\n \t\tgcc \\\r\n \t\tlibc-dev \\\r\n \t\tlinux-headers \\\r\n+\t\tlua5.3-dev \\\r\n \t\tmake \\\r\n \t\topenssl \\\r\n \t\topenssl-dev \\\r\n@@ -24,24 +22,6 @@ RUN set -x \\\r\n \t\ttar \\\r\n \t\tzlib-dev \\\r\n \t\\\r\n-# install Lua\r\n-\t&& wget -O lua.tar.gz \"https://www.lua.org/ftp/lua-$LUA_VERSION.tar.gz\" \\\r\n-\t&& echo \"$LUA_SHA1 *lua.tar.gz\" | sha1sum -c \\\r\n-\t&& mkdir -p /usr/src/lua \\\r\n-\t&& tar -xzf lua.tar.gz -C /usr/src/lua --strip-components=1 \\\r\n-\t&& rm lua.tar.gz \\\r\n-\t&& make -C /usr/src/lua -j \"$(getconf _NPROCESSORS_ONLN)\" linux \\\r\n-\t&& make -C /usr/src/lua install \\\r\n-# put things we don't care about into a \"trash\" directory for purging\r\n-\t\tINSTALL_BIN='/usr/src/lua/trash/bin' \\\r\n-\t\tINSTALL_CMOD='/usr/src/lua/trash/cmod' \\\r\n-\t\tINSTALL_LMOD='/usr/src/lua/trash/lmod' \\\r\n-\t\tINSTALL_MAN='/usr/src/lua/trash/man' \\\r\n-# ... and since it builds static by default, put those bits somewhere we can purge after we build haproxy\r\n-\t\tINSTALL_INC='/usr/local/lua-install/inc' \\\r\n-\t\tINSTALL_LIB='/usr/local/lua-install/lib' \\\r\n-\t&& rm -rf /usr/src/lua \\\r\n-\t\\\r\n # install HAProxy\r\n \t&& wget -O haproxy.tar.gz \"https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz\" \\\r\n \t&& echo \"$HAPROXY_MD5 *haproxy.tar.gz\" | md5sum -c \\\r\n@@ -51,7 +31,7 @@ RUN set -x \\\r\n \t\\\r\n \t&& makeOpts=' \\\r\n \t\tTARGET=linux2628 \\\r\n-\t\tUSE_LUA=1 LUA_INC=/usr/local/lua-install/inc LUA_LIB=/usr/local/lua-install/lib \\\r\n+\t\tUSE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \\\r\n \t\tUSE_OPENSSL=1 \\\r\n \t\tUSE_PCRE=1 PCREDIR= \\\r\n \t\tUSE_ZLIB=1 \\\r\n@@ -59,9 +39,6 @@ RUN set -x \\\r\n \t&& make -C /usr/src/haproxy -j \"$(getconf _NPROCESSORS_ONLN)\" all $makeOpts \\\r\n \t&& make -C /usr/src/haproxy install-bin $makeOpts \\\r\n \t\\\r\n-# purge the remnants of our static Lua\r\n-\t&& rm -rf /usr/local/lua-install \\\r\n-\t\\\r\n \t&& mkdir -p /usr/local/etc/haproxy \\\r\n \t&& cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \\\r\n \t&& rm -rf /usr/src/haproxy \\\r\ndiff --git a/haproxy_1.6/Dockerfile b/haproxy_1.6/Dockerfile\r\nindex aa942fc..4010993 100644\r\n--- a/haproxy_1.6/Dockerfile\r\n+++ b/haproxy_1.6/Dockerfile\r\n@@ -1,3 +1,4 @@\r\n+# vim:set ft=dockerfile:\r\n FROM debian:jessie-backports\r\n \r\n RUN apt-get update \\\r\n@@ -23,6 +24,7 @@ RUN set -x \\\r\n \t\tlibssl-dev \\\r\n \t\tmake \\\r\n \t\twget \\\r\n+\t\tzlib1g-dev \\\r\n \t' \\\r\n \t&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \\\r\n \t\\\r\ndiff --git a/haproxy_1.7-alpine/Dockerfile b/haproxy_1.7-alpine/Dockerfile\r\nindex 262cb44..40a0f0b 100644\r\n--- a/haproxy_1.7-alpine/Dockerfile\r\n+++ b/haproxy_1.7-alpine/Dockerfile\r\n@@ -1,13 +1,10 @@\r\n-FROM alpine:3.5\r\n+# vim:set ft=dockerfile:\r\n+FROM alpine:3.7\r\n \r\n ENV HAPROXY_MAJOR 1.7\r\n ENV HAPROXY_VERSION 1.7.10\r\n ENV HAPROXY_MD5 a9b98a228660dee5ee65b62e3bd57822\r\n \r\n-# https://www.lua.org/ftp/#source\r\n-ENV LUA_VERSION=5.3.4 \\\r\n-\tLUA_SHA1=79790cfd40e09ba796b01a571d4d63b52b1cd950\r\n-\r\n # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible \"make\" arguments\r\n RUN set -x \\\r\n \t\\\r\n@@ -16,6 +13,7 @@ RUN set -x \\\r\n \t\tgcc \\\r\n \t\tlibc-dev \\\r\n \t\tlinux-headers \\\r\n+\t\tlua5.3-dev \\\r\n \t\tmake \\\r\n \t\topenssl \\\r\n \t\topenssl-dev \\\r\n@@ -24,24 +22,6 @@ RUN set -x \\\r\n \t\ttar \\\r\n \t\tzlib-dev \\\r\n \t\\\r\n-# install Lua\r\n-\t&& wget -O lua.tar.gz \"https://www.lua.org/ftp/lua-$LUA_VERSION.tar.gz\" \\\r\n-\t&& echo \"$LUA_SHA1 *lua.tar.gz\" | sha1sum -c \\\r\n-\t&& mkdir -p /usr/src/lua \\\r\n-\t&& tar -xzf lua.tar.gz -C /usr/src/lua --strip-components=1 \\\r\n-\t&& rm lua.tar.gz \\\r\n-\t&& make -C /usr/src/lua -j \"$(getconf _NPROCESSORS_ONLN)\" linux \\\r\n-\t&& make -C /usr/src/lua install \\\r\n-# put things we don't care about into a \"trash\" directory for purging\r\n-\t\tINSTALL_BIN='/usr/src/lua/trash/bin' \\\r\n-\t\tINSTALL_CMOD='/usr/src/lua/trash/cmod' \\\r\n-\t\tINSTALL_LMOD='/usr/src/lua/trash/lmod' \\\r\n-\t\tINSTALL_MAN='/usr/src/lua/trash/man' \\\r\n-# ... and since it builds static by default, put those bits somewhere we can purge after we build haproxy\r\n-\t\tINSTALL_INC='/usr/local/lua-install/inc' \\\r\n-\t\tINSTALL_LIB='/usr/local/lua-install/lib' \\\r\n-\t&& rm -rf /usr/src/lua \\\r\n-\t\\\r\n # install HAProxy\r\n \t&& wget -O haproxy.tar.gz \"https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz\" \\\r\n \t&& echo \"$HAPROXY_MD5 *haproxy.tar.gz\" | md5sum -c \\\r\n@@ -51,7 +31,7 @@ RUN set -x \\\r\n \t\\\r\n \t&& makeOpts=' \\\r\n \t\tTARGET=linux2628 \\\r\n-\t\tUSE_LUA=1 LUA_INC=/usr/local/lua-install/inc LUA_LIB=/usr/local/lua-install/lib \\\r\n+\t\tUSE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \\\r\n \t\tUSE_OPENSSL=1 \\\r\n \t\tUSE_PCRE=1 PCREDIR= \\\r\n \t\tUSE_ZLIB=1 \\\r\n@@ -59,9 +39,6 @@ RUN set -x \\\r\n \t&& make -C /usr/src/haproxy -j \"$(getconf _NPROCESSORS_ONLN)\" all $makeOpts \\\r\n \t&& make -C /usr/src/haproxy install-bin $makeOpts \\\r\n \t\\\r\n-# purge the remnants of our static Lua\r\n-\t&& rm -rf /usr/local/lua-install \\\r\n-\t\\\r\n \t&& mkdir -p /usr/local/etc/haproxy \\\r\n \t&& cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \\\r\n \t&& rm -rf /usr/src/haproxy \\\r\ndiff --git a/haproxy_1.7/Dockerfile b/haproxy_1.7/Dockerfile\r\nindex 6bb0b4c..0a1f1f2 100644\r\n--- a/haproxy_1.7/Dockerfile\r\n+++ b/haproxy_1.7/Dockerfile\r\n@@ -1,10 +1,11 @@\r\n-FROM debian:jessie-backports\r\n+# vim:set ft=dockerfile:\r\n+FROM debian:stretch-slim\r\n \r\n RUN apt-get update \\\r\n \t&& apt-get install -y --no-install-recommends \\\r\n \t\tliblua5.3-0 \\\r\n \t\tlibpcre3 \\\r\n-\t\tlibssl1.0.0 \\\r\n+\t\tlibssl1.1 \\\r\n \t&& rm -rf /var/lib/apt/lists/*\r\n \r\n ENV HAPROXY_MAJOR 1.7\r\n@@ -23,6 +24,7 @@ RUN set -x \\\r\n \t\tlibssl-dev \\\r\n \t\tmake \\\r\n \t\twget \\\r\n+\t\tzlib1g-dev \\\r\n \t' \\\r\n \t&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \\\r\n \t\\\r\ndiff --git a/haproxy_alpine/Dockerfile b/haproxy_alpine/Dockerfile\r\nindex 75ce14e..80f6441 100644\r\n--- a/haproxy_alpine/Dockerfile\r\n+++ b/haproxy_alpine/Dockerfile\r\n@@ -1,13 +1,10 @@\r\n-FROM alpine:3.6\r\n+# vim:set ft=dockerfile:\r\n+FROM alpine:3.7\r\n \r\n ENV HAPROXY_MAJOR 1.8\r\n ENV HAPROXY_VERSION 1.8.8\r\n ENV HAPROXY_MD5 8633b6e661169d2fc6a44d82a3aceae5\r\n \r\n-# https://www.lua.org/ftp/#source\r\n-ENV LUA_VERSION=5.3.4 \\\r\n-\tLUA_SHA1=79790cfd40e09ba796b01a571d4d63b52b1cd950\r\n-\r\n # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible \"make\" arguments\r\n RUN set -x \\\r\n \t\\\r\n@@ -16,6 +13,7 @@ RUN set -x \\\r\n \t\tgcc \\\r\n \t\tlibc-dev \\\r\n \t\tlinux-headers \\\r\n+\t\tlua5.3-dev \\\r\n \t\tmake \\\r\n \t\topenssl \\\r\n \t\topenssl-dev \\\r\n@@ -24,24 +22,6 @@ RUN set -x \\\r\n \t\ttar \\\r\n \t\tzlib-dev \\\r\n \t\\\r\n-# install Lua\r\n-\t&& wget -O lua.tar.gz \"https://www.lua.org/ftp/lua-$LUA_VERSION.tar.gz\" \\\r\n-\t&& echo \"$LUA_SHA1 *lua.tar.gz\" | sha1sum -c \\\r\n-\t&& mkdir -p /usr/src/lua \\\r\n-\t&& tar -xzf lua.tar.gz -C /usr/src/lua --strip-components=1 \\\r\n-\t&& rm lua.tar.gz \\\r\n-\t&& make -C /usr/src/lua -j \"$(getconf _NPROCESSORS_ONLN)\" linux \\\r\n-\t&& make -C /usr/src/lua install \\\r\n-# put things we don't care about into a \"trash\" directory for purging\r\n-\t\tINSTALL_BIN='/usr/src/lua/trash/bin' \\\r\n-\t\tINSTALL_CMOD='/usr/src/lua/trash/cmod' \\\r\n-\t\tINSTALL_LMOD='/usr/src/lua/trash/lmod' \\\r\n-\t\tINSTALL_MAN='/usr/src/lua/trash/man' \\\r\n-# ... and since it builds static by default, put those bits somewhere we can purge after we build haproxy\r\n-\t\tINSTALL_INC='/usr/local/lua-install/inc' \\\r\n-\t\tINSTALL_LIB='/usr/local/lua-install/lib' \\\r\n-\t&& rm -rf /usr/src/lua \\\r\n-\t\\\r\n # install HAProxy\r\n \t&& wget -O haproxy.tar.gz \"https://www.haproxy.org/download/${HAPROXY_MAJOR}/src/haproxy-${HAPROXY_VERSION}.tar.gz\" \\\r\n \t&& echo \"$HAPROXY_MD5 *haproxy.tar.gz\" | md5sum -c \\\r\n@@ -51,7 +31,7 @@ RUN set -x \\\r\n \t\\\r\n \t&& makeOpts=' \\\r\n \t\tTARGET=linux2628 \\\r\n-\t\tUSE_LUA=1 LUA_INC=/usr/local/lua-install/inc LUA_LIB=/usr/local/lua-install/lib \\\r\n+\t\tUSE_LUA=1 LUA_INC=/usr/include/lua5.3 LUA_LIB=/usr/lib/lua5.3 \\\r\n \t\tUSE_OPENSSL=1 \\\r\n \t\tUSE_PCRE=1 PCREDIR= \\\r\n \t\tUSE_ZLIB=1 \\\r\n@@ -59,9 +39,6 @@ RUN set -x \\\r\n \t&& make -C /usr/src/haproxy -j \"$(getconf _NPROCESSORS_ONLN)\" all $makeOpts \\\r\n \t&& make -C /usr/src/haproxy install-bin $makeOpts \\\r\n \t\\\r\n-# purge the remnants of our static Lua\r\n-\t&& rm -rf /usr/local/lua-install \\\r\n-\t\\\r\n \t&& mkdir -p /usr/local/etc/haproxy \\\r\n \t&& cp -R /usr/src/haproxy/examples/errorfiles /usr/local/etc/haproxy/errors \\\r\n \t&& rm -rf /usr/src/haproxy \\\r\ndiff --git a/haproxy_latest/Dockerfile b/haproxy_latest/Dockerfile\r\nindex 91480be..9102343 100644\r\n--- a/haproxy_latest/Dockerfile\r\n+++ b/haproxy_latest/Dockerfile\r\n@@ -1,3 +1,4 @@\r\n+# vim:set ft=dockerfile:\r\n FROM debian:stretch-slim\r\n \r\n RUN apt-get update \\\r\n@@ -21,9 +22,9 @@ RUN set -x \\\r\n \t\tliblua5.3-dev \\\r\n \t\tlibpcre3-dev \\\r\n \t\tlibssl-dev \\\r\n-\t\tzlib1g-dev \\\r\n \t\tmake \\\r\n \t\twget \\\r\n+\t\tzlib1g-dev \\\r\n \t' \\\r\n \t&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \\\r\n \t\\\r\ndiff --git a/mariadb_5/Dockerfile b/mariadb_5/Dockerfile\r\nindex fd2fe31..1280b50 100644\r\n--- a/mariadb_5/Dockerfile\r\n+++ b/mariadb_5/Dockerfile\r\n@@ -73,7 +73,7 @@ RUN echo \"deb https://repo.percona.com/apt wheezy main\" > /etc/apt/sources.list.\r\n \t} > /etc/apt/preferences.d/percona\r\n \r\n ENV MARIADB_MAJOR 5.5\r\n-ENV MARIADB_VERSION 5.5.59+maria-1~wheezy\r\n+ENV MARIADB_VERSION 5.5.60+maria-1~wheezy\r\n \r\n RUN echo \"deb http://ftp.osuosl.org/pub/mariadb/repo/$MARIADB_MAJOR/debian wheezy main\" > /etc/apt/sources.list.d/mariadb.list \\\r\n \t&& { \\\r\ndiff --git a/matomo_3-fpm/Dockerfile b/matomo_fpm/Dockerfile\r\nsimilarity index 100%\r\nrename from matomo_3-fpm/Dockerfile\r\nrename to matomo_fpm/Dockerfile\r\ndiff --git a/matomo_3-fpm/docker-entrypoint.sh b/matomo_fpm/docker-entrypoint.sh\r\nsimilarity index 100%\r\nrename from matomo_3-fpm/docker-entrypoint.sh\r\nrename to matomo_fpm/docker-entrypoint.sh\r\ndiff --git a/matomo_3-fpm/php.ini b/matomo_fpm/php.ini\r\nsimilarity index 100%\r\nrename from matomo_3-fpm/php.ini\r\nrename to matomo_fpm/php.ini\r\ndiff --git a/matomo_3/Dockerfile b/matomo_latest/Dockerfile\r\nsimilarity index 100%\r\nrename from matomo_3/Dockerfile\r\nrename to matomo_latest/Dockerfile\r\ndiff --git a/matomo_3/docker-entrypoint.sh b/matomo_latest/docker-entrypoint.sh\r\nsimilarity index 100%\r\nrename from matomo_3/docker-entrypoint.sh\r\nrename to matomo_latest/docker-entrypoint.sh\r\ndiff --git a/matomo_3/php.ini b/matomo_latest/php.ini\r\nsimilarity index 100%\r\nrename from matomo_3/php.ini\r\nrename to matomo_latest/php.ini\r\ndiff --git a/mongo_unstable-jessie/Dockerfile b/mongo_unstable-jessie/Dockerfile\r\nindex 9991e76..c1ccb0d 100644\r\n--- a/mongo_unstable-jessie/Dockerfile\r\n+++ b/mongo_unstable-jessie/Dockerfile\r\n@@ -64,7 +64,7 @@ ARG MONGO_REPO=repo.mongodb.org\r\n ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}\r\n \r\n ENV MONGO_MAJOR 3.7\r\n-ENV MONGO_VERSION 3.7.5\r\n+ENV MONGO_VERSION 3.7.7\r\n \r\n RUN echo \"deb http://$MONGO_REPO/apt/debian jessie/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR main\" | tee \"/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list\"\r\n \r\ndiff --git a/openjdk_nanoserver-sac2016/Dockerfile b/openjdk_nanoserver-sac2016/Dockerfile\r\nindex d96beeb..6d03853 100644\r\n--- a/openjdk_nanoserver-sac2016/Dockerfile\r\n+++ b/openjdk_nanoserver-sac2016/Dockerfile\r\n@@ -23,10 +23,10 @@ RUN $newPath = ('{0}\\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \\\r\n \tsetx /M PATH $newPath;\r\n \r\n # https://github.com/ojdkbuild/ojdkbuild/releases\r\n-ENV JAVA_VERSION 8u161\r\n-ENV JAVA_OJDKBUILD_VERSION 1.8.0.161-1\r\n-ENV JAVA_OJDKBUILD_ZIP java-1.8.0-openjdk-1.8.0.161-1.b14.ojdkbuild.windows.x86_64.zip\r\n-ENV JAVA_OJDKBUILD_SHA256 7fcd9909173ed19f4ae6c0bba8b32b1e6bece2d49eb9d87271828be8121fc31b\r\n+ENV JAVA_VERSION 8u171\r\n+ENV JAVA_OJDKBUILD_VERSION 1.8.0.171-1\r\n+ENV JAVA_OJDKBUILD_ZIP java-1.8.0-openjdk-1.8.0.171-1.b10.ojdkbuild.windows.x86_64.zip\r\n+ENV JAVA_OJDKBUILD_SHA256 35104f658ed51d1b24cf6f0f6d1d21524d7640d3e3e7b64d8d7ac86cbfbc2ab9\r\n \r\n RUN $url = ('https://github.com/ojdkbuild/ojdkbuild/releases/download/{0}/{1}' -f $env:JAVA_OJDKBUILD_VERSION, $env:JAVA_OJDKBUILD_ZIP); \\\r\n \tWrite-Host ('Downloading {0} ...' -f $url); \\\r\ndiff --git a/openjdk_windowsservercore-1709/Dockerfile b/openjdk_windowsservercore-1709/Dockerfile\r\nindex aa9294c..301a4cf 100644\r\n--- a/openjdk_windowsservercore-1709/Dockerfile\r\n+++ b/openjdk_windowsservercore-1709/Dockerfile\r\n@@ -10,10 +10,10 @@ RUN $newPath = ('{0}\\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \\\r\n \tsetx /M PATH $newPath;\r\n \r\n # https://github.com/ojdkbuild/ojdkbuild/releases\r\n-ENV JAVA_VERSION 8u161\r\n-ENV JAVA_OJDKBUILD_VERSION 1.8.0.161-1\r\n-ENV JAVA_OJDKBUILD_ZIP java-1.8.0-openjdk-1.8.0.161-1.b14.ojdkbuild.windows.x86_64.zip\r\n-ENV JAVA_OJDKBUILD_SHA256 7fcd9909173ed19f4ae6c0bba8b32b1e6bece2d49eb9d87271828be8121fc31b\r\n+ENV JAVA_VERSION 8u171\r\n+ENV JAVA_OJDKBUILD_VERSION 1.8.0.171-1\r\n+ENV JAVA_OJDKBUILD_ZIP java-1.8.0-openjdk-1.8.0.171-1.b10.ojdkbuild.windows.x86_64.zip\r\n+ENV JAVA_OJDKBUILD_SHA256 35104f658ed51d1b24cf6f0f6d1d21524d7640d3e3e7b64d8d7ac86cbfbc2ab9\r\n \r\n RUN $url = ('https://github.com/ojdkbuild/ojdkbuild/releases/download/{0}/{1}' -f $env:JAVA_OJDKBUILD_VERSION, $env:JAVA_OJDKBUILD_ZIP); \\\r\n \tWrite-Host ('Downloading {0} ...' -f $url); \\\r\ndiff --git a/openjdk_windowsservercore-ltsc2016/Dockerfile b/openjdk_windowsservercore-ltsc2016/Dockerfile\r\nindex 3782abf..2067fb5 100644\r\n--- a/openjdk_windowsservercore-ltsc2016/Dockerfile\r\n+++ b/openjdk_windowsservercore-ltsc2016/Dockerfile\r\n@@ -10,10 +10,10 @@ RUN $newPath = ('{0}\\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \\\r\n \tsetx /M PATH $newPath;\r\n \r\n # https://github.com/ojdkbuild/ojdkbuild/releases\r\n-ENV JAVA_VERSION 8u161\r\n-ENV JAVA_OJDKBUILD_VERSION 1.8.0.161-1\r\n-ENV JAVA_OJDKBUILD_ZIP java-1.8.0-openjdk-1.8.0.161-1.b14.ojdkbuild.windows.x86_64.zip\r\n-ENV JAVA_OJDKBUILD_SHA256 7fcd9909173ed19f4ae6c0bba8b32b1e6bece2d49eb9d87271828be8121fc31b\r\n+ENV JAVA_VERSION 8u171\r\n+ENV JAVA_OJDKBUILD_VERSION 1.8.0.171-1\r\n+ENV JAVA_OJDKBUILD_ZIP java-1.8.0-openjdk-1.8.0.171-1.b10.ojdkbuild.windows.x86_64.zip\r\n+ENV JAVA_OJDKBUILD_SHA256 35104f658ed51d1b24cf6f0f6d1d21524d7640d3e3e7b64d8d7ac86cbfbc2ab9\r\n \r\n RUN $url = ('https://github.com/ojdkbuild/ojdkbuild/releases/download/{0}/{1}' -f $env:JAVA_OJDKBUILD_VERSION, $env:JAVA_OJDKBUILD_ZIP); \\\r\n \tWrite-Host ('Downloading {0} ...' -f $url); \\\r\ndiff --git a/percona_latest/Dockerfile b/percona_latest/Dockerfile\r\nindex d6ee981..cff58d6 100644\r\n--- a/percona_latest/Dockerfile\r\n+++ b/percona_latest/Dockerfile\r\n@@ -50,7 +50,7 @@ RUN set -ex; \\\r\n RUN echo 'deb https://repo.percona.com/apt jessie main' > /etc/apt/sources.list.d/percona.list\r\n \r\n ENV PERCONA_MAJOR 5.7\r\n-ENV PERCONA_VERSION 5.7.21-20-1.jessie\r\n+ENV PERCONA_VERSION 5.7.21-21-3.jessie\r\n \r\n # the \"/var/lib/mysql\" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already \"configured\" (ie, stuff in /var/lib/mysql/mysql)\r\n # also, we set debconf keys to make APT a little quieter\r\ndiff --git a/php_7.0-alpine/Dockerfile b/php_7.0-alpine/Dockerfile\r\nindex eb6cf30..188eb4a 100644\r\n--- a/php_7.0-alpine/Dockerfile\r\n+++ b/php_7.0-alpine/Dockerfile\r\n@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3\r\n \r\n-ENV PHP_VERSION 7.0.29\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"ca79d3ecc123bff4b623d4a1bbf5ad53ad39f5f2f5912fecc0ea97e95eba21cc\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.0.30\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"c90892fb68ab9b8476519658d3f78f6388f2609ae1309bdc2a2e1cc9f92dd686\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_7.0-apache/Dockerfile b/php_7.0-apache/Dockerfile\r\nindex e310222..92652d9 100644\r\n--- a/php_7.0-apache/Dockerfile\r\n+++ b/php_7.0-apache/Dockerfile\r\n@@ -113,9 +113,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3\r\n \r\n-ENV PHP_VERSION 7.0.29\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"ca79d3ecc123bff4b623d4a1bbf5ad53ad39f5f2f5912fecc0ea97e95eba21cc\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.0.30\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"c90892fb68ab9b8476519658d3f78f6388f2609ae1309bdc2a2e1cc9f92dd686\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_7.0-fpm-alpine/Dockerfile b/php_7.0-fpm-alpine/Dockerfile\r\nindex a79b8a6..6a04a77 100644\r\n--- a/php_7.0-fpm-alpine/Dockerfile\r\n+++ b/php_7.0-fpm-alpine/Dockerfile\r\n@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3\r\n \r\n-ENV PHP_VERSION 7.0.29\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"ca79d3ecc123bff4b623d4a1bbf5ad53ad39f5f2f5912fecc0ea97e95eba21cc\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.0.30\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"c90892fb68ab9b8476519658d3f78f6388f2609ae1309bdc2a2e1cc9f92dd686\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_7.0-fpm/Dockerfile b/php_7.0-fpm/Dockerfile\r\nindex 48d6873..22666d8 100644\r\n--- a/php_7.0-fpm/Dockerfile\r\n+++ b/php_7.0-fpm/Dockerfile\r\n@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3\r\n \r\n-ENV PHP_VERSION 7.0.29\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"ca79d3ecc123bff4b623d4a1bbf5ad53ad39f5f2f5912fecc0ea97e95eba21cc\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.0.30\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"c90892fb68ab9b8476519658d3f78f6388f2609ae1309bdc2a2e1cc9f92dd686\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_7.0-zts-alpine/Dockerfile b/php_7.0-zts-alpine/Dockerfile\r\nindex ed7a93f..f81463c 100644\r\n--- a/php_7.0-zts-alpine/Dockerfile\r\n+++ b/php_7.0-zts-alpine/Dockerfile\r\n@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3\r\n \r\n-ENV PHP_VERSION 7.0.29\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"ca79d3ecc123bff4b623d4a1bbf5ad53ad39f5f2f5912fecc0ea97e95eba21cc\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.0.30\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"c90892fb68ab9b8476519658d3f78f6388f2609ae1309bdc2a2e1cc9f92dd686\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_7.0-zts/Dockerfile b/php_7.0-zts/Dockerfile\r\nindex da37e0c..e4ebf00 100644\r\n--- a/php_7.0-zts/Dockerfile\r\n+++ b/php_7.0-zts/Dockerfile\r\n@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3\r\n \r\n-ENV PHP_VERSION 7.0.29\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"ca79d3ecc123bff4b623d4a1bbf5ad53ad39f5f2f5912fecc0ea97e95eba21cc\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.0.30\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"c90892fb68ab9b8476519658d3f78f6388f2609ae1309bdc2a2e1cc9f92dd686\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_7.0/Dockerfile b/php_7.0/Dockerfile\r\nindex 1a6414e..9ae2240 100644\r\n--- a/php_7.0/Dockerfile\r\n+++ b/php_7.0/Dockerfile\r\n@@ -54,9 +54,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1A4E8B7277C42E53DBA9C7B9BCAA30EA9C0D5763 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3\r\n \r\n-ENV PHP_VERSION 7.0.29\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.29.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"ca79d3ecc123bff4b623d4a1bbf5ad53ad39f5f2f5912fecc0ea97e95eba21cc\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.0.30\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.0.30.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"c90892fb68ab9b8476519658d3f78f6388f2609ae1309bdc2a2e1cc9f92dd686\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_alpine/Dockerfile b/php_alpine/Dockerfile\r\nindex 7ef82ff..b6f0373 100644\r\n--- a/php_alpine/Dockerfile\r\n+++ b/php_alpine/Dockerfile\r\n@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F\r\n \r\n-ENV PHP_VERSION 7.2.4\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.2.5\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_alpine3.7/Dockerfile b/php_alpine3.7/Dockerfile\r\nindex 0551f80..2e53a22 100644\r\n--- a/php_alpine3.7/Dockerfile\r\n+++ b/php_alpine3.7/Dockerfile\r\n@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F\r\n \r\n-ENV PHP_VERSION 7.2.4\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.2.5\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_apache/Dockerfile b/php_apache/Dockerfile\r\nindex 4538121..184ea45 100644\r\n--- a/php_apache/Dockerfile\r\n+++ b/php_apache/Dockerfile\r\n@@ -113,9 +113,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F\r\n \r\n-ENV PHP_VERSION 7.2.4\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.2.5\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_fpm-alpine/Dockerfile b/php_fpm-alpine/Dockerfile\r\nindex 2731ee2..7831f5c 100644\r\n--- a/php_fpm-alpine/Dockerfile\r\n+++ b/php_fpm-alpine/Dockerfile\r\n@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F\r\n \r\n-ENV PHP_VERSION 7.2.4\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.2.5\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_fpm-alpine3.7/Dockerfile b/php_fpm-alpine3.7/Dockerfile\r\nindex e2811be..c9cbb51 100644\r\n--- a/php_fpm-alpine3.7/Dockerfile\r\n+++ b/php_fpm-alpine3.7/Dockerfile\r\n@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F\r\n \r\n-ENV PHP_VERSION 7.2.4\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.2.5\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_fpm/Dockerfile b/php_fpm/Dockerfile\r\nindex 65207db..c9ea174 100644\r\n--- a/php_fpm/Dockerfile\r\n+++ b/php_fpm/Dockerfile\r\n@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F\r\n \r\n-ENV PHP_VERSION 7.2.4\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.2.5\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_latest/Dockerfile b/php_latest/Dockerfile\r\nindex 8bc7476..35381ba 100644\r\n--- a/php_latest/Dockerfile\r\n+++ b/php_latest/Dockerfile\r\n@@ -54,9 +54,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F\r\n \r\n-ENV PHP_VERSION 7.2.4\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.2.5\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_zts-alpine/Dockerfile b/php_zts-alpine/Dockerfile\r\nindex 6a0bacb..4431a25 100644\r\n--- a/php_zts-alpine/Dockerfile\r\n+++ b/php_zts-alpine/Dockerfile\r\n@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F\r\n \r\n-ENV PHP_VERSION 7.2.4\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.2.5\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_zts-alpine3.7/Dockerfile b/php_zts-alpine3.7/Dockerfile\r\nindex 17c11f8..a082470 100644\r\n--- a/php_zts-alpine3.7/Dockerfile\r\n+++ b/php_zts-alpine3.7/Dockerfile\r\n@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F\r\n \r\n-ENV PHP_VERSION 7.2.4\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.2.5\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/php_zts/Dockerfile b/php_zts/Dockerfile\r\nindex 64c7ad1..dcb8193 100644\r\n--- a/php_zts/Dockerfile\r\n+++ b/php_zts/Dockerfile\r\n@@ -55,9 +55,9 @@ ENV PHP_LDFLAGS=\"-Wl,-O1 -Wl,--hash-style=both -pie\"\r\n \r\n ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F\r\n \r\n-ENV PHP_VERSION 7.2.4\r\n-ENV PHP_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.4.tar.xz.asc/from/this/mirror\"\r\n-ENV PHP_SHA256=\"7916b1bd148ddfd46d7f8f9a517d4b09cd8a8ad9248734e7c8dd91ef17057a88\" PHP_MD5=\"\"\r\n+ENV PHP_VERSION 7.2.5\r\n+ENV PHP_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz/from/this/mirror\" PHP_ASC_URL=\"https://secure.php.net/get/php-7.2.5.tar.xz.asc/from/this/mirror\"\r\n+ENV PHP_SHA256=\"af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2\" PHP_MD5=\"\"\r\n \r\n RUN set -xe; \\\r\n \t\\\r\ndiff --git a/piwik_3-fpm/Dockerfile b/piwik_fpm/Dockerfile\r\nsimilarity index 100%\r\nrename from piwik_3-fpm/Dockerfile\r\nrename to piwik_fpm/Dockerfile\r\ndiff --git a/piwik_3-fpm/docker-entrypoint.sh b/piwik_fpm/docker-entrypoint.sh\r\nsimilarity index 100%\r\nrename from piwik_3-fpm/docker-entrypoint.sh\r\nrename to piwik_fpm/docker-entrypoint.sh\r\ndiff --git a/piwik_3-fpm/php.ini b/piwik_fpm/php.ini\r\nsimilarity index 100%\r\nrename from piwik_3-fpm/php.ini\r\nrename to piwik_fpm/php.ini\r\ndiff --git a/piwik_3/Dockerfile b/piwik_latest/Dockerfile\r\nsimilarity index 100%\r\nrename from piwik_3/Dockerfile\r\nrename to piwik_latest/Dockerfile\r\ndiff --git a/piwik_3/docker-entrypoint.sh b/piwik_latest/docker-entrypoint.sh\r\nsimilarity index 100%\r\nrename from piwik_3/docker-entrypoint.sh\r\nrename to piwik_latest/docker-entrypoint.sh\r\ndiff --git a/piwik_3/php.ini b/piwik_latest/php.ini\r\nsimilarity index 100%\r\nrename from piwik_3/php.ini\r\nrename to piwik_latest/php.ini\r\ndiff --git a/postgres_9-alpine/Dockerfile b/postgres_9-alpine/Dockerfile\r\nindex 7cfe22a..b0f08f1 100644\r\n--- a/postgres_9-alpine/Dockerfile\r\n+++ b/postgres_9-alpine/Dockerfile\r\n@@ -1,5 +1,5 @@\r\n # vim:set ft=dockerfile:\r\n-FROM alpine:3.5\r\n+FROM alpine:3.7\r\n \r\n # alpine includes \"postgres\" user/group in base install\r\n #   /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh\r\n@@ -57,7 +57,7 @@ RUN set -ex \\\r\n #\t\topenldap-dev \\\r\n \t\topenssl-dev \\\r\n # configure: error: prove not found\r\n-\t\tperl \\\r\n+\t\tperl-utils \\\r\n # configure: error: Perl module IPC::Run is required to run TAP tests\r\n \t\tperl-ipc-run \\\r\n #\t\tperl-dev \\\r\ndiff --git a/postgres_9.3-alpine/Dockerfile b/postgres_9.3-alpine/Dockerfile\r\nindex 12cb52e..7948701 100644\r\n--- a/postgres_9.3-alpine/Dockerfile\r\n+++ b/postgres_9.3-alpine/Dockerfile\r\n@@ -1,5 +1,5 @@\r\n # vim:set ft=dockerfile:\r\n-FROM alpine:3.5\r\n+FROM alpine:3.7\r\n \r\n # alpine includes \"postgres\" user/group in base install\r\n #   /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh\r\n@@ -60,7 +60,7 @@ RUN set -ex \\\r\n #\t\topenldap-dev \\\r\n \t\topenssl-dev \\\r\n # configure: error: prove not found\r\n-\t\tperl \\\r\n+\t\tperl-utils \\\r\n # configure: error: Perl module IPC::Run is required to run TAP tests\r\n \t\tperl-ipc-run \\\r\n #\t\tperl-dev \\\r\ndiff --git a/postgres_9.3/Dockerfile b/postgres_9.3/Dockerfile\r\nindex 3f8b5c0..7bb3abb 100644\r\n--- a/postgres_9.3/Dockerfile\r\n+++ b/postgres_9.3/Dockerfile\r\n@@ -1,5 +1,5 @@\r\n # vim:set ft=dockerfile:\r\n-FROM debian:jessie\r\n+FROM debian:stretch-slim\r\n \r\n RUN set -ex; \\\r\n \tif ! command -v gpg > /dev/null; then \\\r\n@@ -29,8 +29,15 @@ RUN set -x \\\r\n \t&& apt-get purge -y --auto-remove ca-certificates wget\r\n \r\n # make the \"en_US.UTF-8\" locale so postgres will be utf-8 enabled by default\r\n-RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \\\r\n-\t&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8\r\n+RUN set -eux; \\\r\n+\tif [ -f /etc/dpkg/dpkg.cfg.d/docker ]; then \\\r\n+# if this file exists, we're likely in \"debian:xxx-slim\", and locales are thus being excluded so we need to remove that exclusion (since we need locales)\r\n+\t\tgrep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\t\tsed -ri '/\\/usr\\/share\\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\t\t! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\tfi; \\\r\n+\tapt-get update; apt-get install -y locales; rm -rf /var/lib/apt/lists/*; \\\r\n+\tlocaledef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8\r\n ENV LANG en_US.utf8\r\n \r\n RUN mkdir /docker-entrypoint-initdb.d\r\n@@ -47,7 +54,7 @@ RUN set -ex; \\\r\n \tapt-key list\r\n \r\n ENV PG_MAJOR 9.3\r\n-ENV PG_VERSION 9.3.22-1.pgdg80+1\r\n+ENV PG_VERSION 9.3.22-1.pgdg90+1\r\n \r\n RUN set -ex; \\\r\n \t\\\r\n@@ -55,13 +62,13 @@ RUN set -ex; \\\r\n \tcase \"$dpkgArch\" in \\\r\n \t\tamd64|i386|ppc64el) \\\r\n # arches officialy built by upstream\r\n-\t\t\techo \"deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n+\t\t\techo \"deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n \t\t\tapt-get update; \\\r\n \t\t\t;; \\\r\n \t\t*) \\\r\n # we're on an architecture upstream doesn't officially build for\r\n # let's build binaries from their published source packages\r\n-\t\t\techo \"deb-src http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n+\t\t\techo \"deb-src http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n \t\t\t\\\r\n \t\t\ttempDir=\"$(mktemp -d)\"; \\\r\n \t\t\tcd \"$tempDir\"; \\\r\ndiff --git a/postgres_9.4-alpine/Dockerfile b/postgres_9.4-alpine/Dockerfile\r\nindex d586e05..ba77876 100644\r\n--- a/postgres_9.4-alpine/Dockerfile\r\n+++ b/postgres_9.4-alpine/Dockerfile\r\n@@ -1,5 +1,5 @@\r\n # vim:set ft=dockerfile:\r\n-FROM alpine:3.5\r\n+FROM alpine:3.7\r\n \r\n # alpine includes \"postgres\" user/group in base install\r\n #   /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh\r\n@@ -57,7 +57,7 @@ RUN set -ex \\\r\n #\t\topenldap-dev \\\r\n \t\topenssl-dev \\\r\n # configure: error: prove not found\r\n-\t\tperl \\\r\n+\t\tperl-utils \\\r\n # configure: error: Perl module IPC::Run is required to run TAP tests\r\n \t\tperl-ipc-run \\\r\n #\t\tperl-dev \\\r\ndiff --git a/postgres_9.4/Dockerfile b/postgres_9.4/Dockerfile\r\nindex 125ba68..17d6a9a 100644\r\n--- a/postgres_9.4/Dockerfile\r\n+++ b/postgres_9.4/Dockerfile\r\n@@ -1,5 +1,5 @@\r\n # vim:set ft=dockerfile:\r\n-FROM debian:jessie\r\n+FROM debian:stretch-slim\r\n \r\n RUN set -ex; \\\r\n \tif ! command -v gpg > /dev/null; then \\\r\n@@ -29,8 +29,15 @@ RUN set -x \\\r\n \t&& apt-get purge -y --auto-remove ca-certificates wget\r\n \r\n # make the \"en_US.UTF-8\" locale so postgres will be utf-8 enabled by default\r\n-RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \\\r\n-\t&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8\r\n+RUN set -eux; \\\r\n+\tif [ -f /etc/dpkg/dpkg.cfg.d/docker ]; then \\\r\n+# if this file exists, we're likely in \"debian:xxx-slim\", and locales are thus being excluded so we need to remove that exclusion (since we need locales)\r\n+\t\tgrep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\t\tsed -ri '/\\/usr\\/share\\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\t\t! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\tfi; \\\r\n+\tapt-get update; apt-get install -y locales; rm -rf /var/lib/apt/lists/*; \\\r\n+\tlocaledef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8\r\n ENV LANG en_US.utf8\r\n \r\n RUN mkdir /docker-entrypoint-initdb.d\r\n@@ -47,7 +54,7 @@ RUN set -ex; \\\r\n \tapt-key list\r\n \r\n ENV PG_MAJOR 9.4\r\n-ENV PG_VERSION 9.4.17-1.pgdg80+1\r\n+ENV PG_VERSION 9.4.17-1.pgdg90+1\r\n \r\n RUN set -ex; \\\r\n \t\\\r\n@@ -55,13 +62,13 @@ RUN set -ex; \\\r\n \tcase \"$dpkgArch\" in \\\r\n \t\tamd64|i386|ppc64el) \\\r\n # arches officialy built by upstream\r\n-\t\t\techo \"deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n+\t\t\techo \"deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n \t\t\tapt-get update; \\\r\n \t\t\t;; \\\r\n \t\t*) \\\r\n # we're on an architecture upstream doesn't officially build for\r\n # let's build binaries from their published source packages\r\n-\t\t\techo \"deb-src http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n+\t\t\techo \"deb-src http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n \t\t\t\\\r\n \t\t\ttempDir=\"$(mktemp -d)\"; \\\r\n \t\t\tcd \"$tempDir\"; \\\r\ndiff --git a/postgres_9.5-alpine/Dockerfile b/postgres_9.5-alpine/Dockerfile\r\nindex c43a9af..4cff2d4 100644\r\n--- a/postgres_9.5-alpine/Dockerfile\r\n+++ b/postgres_9.5-alpine/Dockerfile\r\n@@ -1,5 +1,5 @@\r\n # vim:set ft=dockerfile:\r\n-FROM alpine:3.5\r\n+FROM alpine:3.7\r\n \r\n # alpine includes \"postgres\" user/group in base install\r\n #   /etc/passwd:22:postgres:x:70:70::/var/lib/postgresql:/bin/sh\r\n@@ -57,7 +57,7 @@ RUN set -ex \\\r\n #\t\topenldap-dev \\\r\n \t\topenssl-dev \\\r\n # configure: error: prove not found\r\n-\t\tperl \\\r\n+\t\tperl-utils \\\r\n # configure: error: Perl module IPC::Run is required to run TAP tests\r\n \t\tperl-ipc-run \\\r\n #\t\tperl-dev \\\r\ndiff --git a/postgres_9.5/Dockerfile b/postgres_9.5/Dockerfile\r\nindex 1eb3221..81b8513 100644\r\n--- a/postgres_9.5/Dockerfile\r\n+++ b/postgres_9.5/Dockerfile\r\n@@ -1,5 +1,5 @@\r\n # vim:set ft=dockerfile:\r\n-FROM debian:jessie\r\n+FROM debian:stretch-slim\r\n \r\n RUN set -ex; \\\r\n \tif ! command -v gpg > /dev/null; then \\\r\n@@ -29,8 +29,15 @@ RUN set -x \\\r\n \t&& apt-get purge -y --auto-remove ca-certificates wget\r\n \r\n # make the \"en_US.UTF-8\" locale so postgres will be utf-8 enabled by default\r\n-RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \\\r\n-\t&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8\r\n+RUN set -eux; \\\r\n+\tif [ -f /etc/dpkg/dpkg.cfg.d/docker ]; then \\\r\n+# if this file exists, we're likely in \"debian:xxx-slim\", and locales are thus being excluded so we need to remove that exclusion (since we need locales)\r\n+\t\tgrep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\t\tsed -ri '/\\/usr\\/share\\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\t\t! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\tfi; \\\r\n+\tapt-get update; apt-get install -y locales; rm -rf /var/lib/apt/lists/*; \\\r\n+\tlocaledef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8\r\n ENV LANG en_US.utf8\r\n \r\n RUN mkdir /docker-entrypoint-initdb.d\r\n@@ -47,7 +54,7 @@ RUN set -ex; \\\r\n \tapt-key list\r\n \r\n ENV PG_MAJOR 9.5\r\n-ENV PG_VERSION 9.5.12-1.pgdg80+1\r\n+ENV PG_VERSION 9.5.12-1.pgdg90+1\r\n \r\n RUN set -ex; \\\r\n \t\\\r\n@@ -55,13 +62,13 @@ RUN set -ex; \\\r\n \tcase \"$dpkgArch\" in \\\r\n \t\tamd64|i386|ppc64el) \\\r\n # arches officialy built by upstream\r\n-\t\t\techo \"deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n+\t\t\techo \"deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n \t\t\tapt-get update; \\\r\n \t\t\t;; \\\r\n \t\t*) \\\r\n # we're on an architecture upstream doesn't officially build for\r\n # let's build binaries from their published source packages\r\n-\t\t\techo \"deb-src http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n+\t\t\techo \"deb-src http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n \t\t\t\\\r\n \t\t\ttempDir=\"$(mktemp -d)\"; \\\r\n \t\t\tcd \"$tempDir\"; \\\r\ndiff --git a/postgres_9/Dockerfile b/postgres_9/Dockerfile\r\nindex a6d04c3..25c34c0 100644\r\n--- a/postgres_9/Dockerfile\r\n+++ b/postgres_9/Dockerfile\r\n@@ -1,5 +1,5 @@\r\n # vim:set ft=dockerfile:\r\n-FROM debian:jessie\r\n+FROM debian:stretch-slim\r\n \r\n RUN set -ex; \\\r\n \tif ! command -v gpg > /dev/null; then \\\r\n@@ -29,8 +29,15 @@ RUN set -x \\\r\n \t&& apt-get purge -y --auto-remove ca-certificates wget\r\n \r\n # make the \"en_US.UTF-8\" locale so postgres will be utf-8 enabled by default\r\n-RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \\\r\n-\t&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8\r\n+RUN set -eux; \\\r\n+\tif [ -f /etc/dpkg/dpkg.cfg.d/docker ]; then \\\r\n+# if this file exists, we're likely in \"debian:xxx-slim\", and locales are thus being excluded so we need to remove that exclusion (since we need locales)\r\n+\t\tgrep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\t\tsed -ri '/\\/usr\\/share\\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\t\t! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\tfi; \\\r\n+\tapt-get update; apt-get install -y locales; rm -rf /var/lib/apt/lists/*; \\\r\n+\tlocaledef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8\r\n ENV LANG en_US.utf8\r\n \r\n RUN mkdir /docker-entrypoint-initdb.d\r\n@@ -47,7 +54,7 @@ RUN set -ex; \\\r\n \tapt-key list\r\n \r\n ENV PG_MAJOR 9.6\r\n-ENV PG_VERSION 9.6.8-1.pgdg80+1\r\n+ENV PG_VERSION 9.6.8-1.pgdg90+1\r\n \r\n RUN set -ex; \\\r\n \t\\\r\n@@ -55,13 +62,13 @@ RUN set -ex; \\\r\n \tcase \"$dpkgArch\" in \\\r\n \t\tamd64|i386|ppc64el) \\\r\n # arches officialy built by upstream\r\n-\t\t\techo \"deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n+\t\t\techo \"deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n \t\t\tapt-get update; \\\r\n \t\t\t;; \\\r\n \t\t*) \\\r\n # we're on an architecture upstream doesn't officially build for\r\n # let's build binaries from their published source packages\r\n-\t\t\techo \"deb-src http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n+\t\t\techo \"deb-src http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR\" > /etc/apt/sources.list.d/pgdg.list; \\\r\n \t\t\t\\\r\n \t\t\ttempDir=\"$(mktemp -d)\"; \\\r\n \t\t\tcd \"$tempDir\"; \\\r\ndiff --git a/postgres_latest/Dockerfile b/postgres_latest/Dockerfile\r\nindex 8804367..378c91d 100644\r\n--- a/postgres_latest/Dockerfile\r\n+++ b/postgres_latest/Dockerfile\r\n@@ -1,5 +1,5 @@\r\n # vim:set ft=dockerfile:\r\n-FROM debian:stretch\r\n+FROM debian:stretch-slim\r\n \r\n RUN set -ex; \\\r\n \tif ! command -v gpg > /dev/null; then \\\r\n@@ -29,8 +29,15 @@ RUN set -x \\\r\n \t&& apt-get purge -y --auto-remove ca-certificates wget\r\n \r\n # make the \"en_US.UTF-8\" locale so postgres will be utf-8 enabled by default\r\n-RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \\\r\n-\t&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8\r\n+RUN set -eux; \\\r\n+\tif [ -f /etc/dpkg/dpkg.cfg.d/docker ]; then \\\r\n+# if this file exists, we're likely in \"debian:xxx-slim\", and locales are thus being excluded so we need to remove that exclusion (since we need locales)\r\n+\t\tgrep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\t\tsed -ri '/\\/usr\\/share\\/locale/d' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\t\t! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker; \\\r\n+\tfi; \\\r\n+\tapt-get update; apt-get install -y locales; rm -rf /var/lib/apt/lists/*; \\\r\n+\tlocaledef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8\r\n ENV LANG en_US.utf8\r\n \r\n RUN mkdir /docker-entrypoint-initdb.d\r\ndiff --git a/pypy_2-slim/Dockerfile b/pypy_2-slim/Dockerfile\r\nindex 4d5fe2c..5d08b7e 100644\r\n--- a/pypy_2-slim/Dockerfile\r\n+++ b/pypy_2-slim/Dockerfile\r\n@@ -15,10 +15,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \\\r\n \t\tlibsqlite3-0 \\\r\n \t&& rm -rf /var/lib/apt/lists/*\r\n \r\n-ENV PYPY_VERSION 5.10.0\r\n+ENV PYPY_VERSION 6.0.0\r\n \r\n # if this is called \"PIP_VERSION\", pip explodes with \"ValueError: invalid truth value '<VERSION>'\"\r\n-ENV PYTHON_PIP_VERSION 9.0.1\r\n+ENV PYTHON_PIP_VERSION 10.0.1\r\n \r\n RUN set -ex; \\\r\n \t\\\r\n@@ -26,11 +26,11 @@ RUN set -ex; \\\r\n \tdpkgArch=\"$(dpkg --print-architecture)\"; \\\r\n \tcase \"${dpkgArch##*-}\" in \\\r\n # amd64\r\n-\t\tamd64) pypyArch='linux64'; sha256='da85af9240220179493ad66c857934dc7ea91aef8f168cd293a2d99af8346ee2' ;; \\\r\n+\t\tamd64) pypyArch='linux64'; sha256='6cbf942ba7c90f504d8d6a2e45d4244e3bf146c8722d64e9410b85eac6b5af67' ;; \\\r\n # arm32v5\r\n-\t\tarmel) pypyArch='linux-armel'; sha256='6fdd55dd8f674efd06f76edb60a09a03b9b04a5fbc56741f416a94a0b9d2ff91' ;; \\\r\n+\t\tarmel) pypyArch='linux-armel'; sha256='924ca3f90aa28e8961859508c25752c95253b842318a0f267267ffe90f56a916' ;; \\\r\n # i386\r\n-\t\ti386) pypyArch='linux32'; sha256='ee1980467ac8cc9fa9d609f7da93c5282503e59a548781248fe1914a7199d540' ;; \\\r\n+\t\ti386) pypyArch='linux32'; sha256='ad1082d4328ae8f32617b14628648583b82b6d29df3aa42b97bd1853c08c4bc8' ;; \\\r\n \t\t*) echo >&2 \"error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release\"; exit 1 ;; \\\r\n \tesac; \\\r\n \t\\\r\ndiff --git a/pypy_2/Dockerfile b/pypy_2/Dockerfile\r\nindex fd2c533..68add4f 100644\r\n--- a/pypy_2/Dockerfile\r\n+++ b/pypy_2/Dockerfile\r\n@@ -13,10 +13,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \\\r\n \t\ttk \\\r\n \t&& rm -rf /var/lib/apt/lists/*\r\n \r\n-ENV PYPY_VERSION 5.10.0\r\n+ENV PYPY_VERSION 6.0.0\r\n \r\n # if this is called \"PIP_VERSION\", pip explodes with \"ValueError: invalid truth value '<VERSION>'\"\r\n-ENV PYTHON_PIP_VERSION 9.0.1\r\n+ENV PYTHON_PIP_VERSION 10.0.1\r\n \r\n RUN set -ex; \\\r\n \t\\\r\n@@ -24,11 +24,11 @@ RUN set -ex; \\\r\n \tdpkgArch=\"$(dpkg --print-architecture)\"; \\\r\n \tcase \"${dpkgArch##*-}\" in \\\r\n # amd64\r\n-\t\tamd64) pypyArch='linux64'; sha256='da85af9240220179493ad66c857934dc7ea91aef8f168cd293a2d99af8346ee2' ;; \\\r\n+\t\tamd64) pypyArch='linux64'; sha256='6cbf942ba7c90f504d8d6a2e45d4244e3bf146c8722d64e9410b85eac6b5af67' ;; \\\r\n # arm32v5\r\n-\t\tarmel) pypyArch='linux-armel'; sha256='6fdd55dd8f674efd06f76edb60a09a03b9b04a5fbc56741f416a94a0b9d2ff91' ;; \\\r\n+\t\tarmel) pypyArch='linux-armel'; sha256='924ca3f90aa28e8961859508c25752c95253b842318a0f267267ffe90f56a916' ;; \\\r\n # i386\r\n-\t\ti386) pypyArch='linux32'; sha256='ee1980467ac8cc9fa9d609f7da93c5282503e59a548781248fe1914a7199d540' ;; \\\r\n+\t\ti386) pypyArch='linux32'; sha256='ad1082d4328ae8f32617b14628648583b82b6d29df3aa42b97bd1853c08c4bc8' ;; \\\r\n \t\t*) echo >&2 \"error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release\"; exit 1 ;; \\\r\n \tesac; \\\r\n \t\\\r\ndiff --git a/pypy_latest/Dockerfile b/pypy_latest/Dockerfile\r\nindex c7e122b..2a0a38b 100644\r\n--- a/pypy_latest/Dockerfile\r\n+++ b/pypy_latest/Dockerfile\r\n@@ -13,10 +13,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \\\r\n \t\ttk \\\r\n \t&& rm -rf /var/lib/apt/lists/*\r\n \r\n-ENV PYPY_VERSION 5.10.1\r\n+ENV PYPY_VERSION 6.0.0\r\n \r\n # if this is called \"PIP_VERSION\", pip explodes with \"ValueError: invalid truth value '<VERSION>'\"\r\n-ENV PYTHON_PIP_VERSION 9.0.1\r\n+ENV PYTHON_PIP_VERSION 10.0.1\r\n \r\n RUN set -ex; \\\r\n \t\\\r\n@@ -24,11 +24,11 @@ RUN set -ex; \\\r\n \tdpkgArch=\"$(dpkg --print-architecture)\"; \\\r\n \tcase \"${dpkgArch##*-}\" in \\\r\n # amd64\r\n-\t\tamd64) pypyArch='linux64'; sha256='75a276e1ee1863967bbacb70c5bff636de200768c0ec90e72f7ec17aace0aefe' ;; \\\r\n+\t\tamd64) pypyArch='linux64'; sha256='4cfffa292b9ef34bb6ba39cdbaa196c5c5cbbc5aa3faaa157cf45d7e34027048' ;; \\\r\n # arm32v5\r\n-\t\tarmel) pypyArch='linux-armel'; sha256='5065e9ad958d06b9612ba974f43997d20168d4245c054dd43270e4b458782282' ;; \\\r\n+\t\tarmel) pypyArch='linux-armel'; sha256='6a6888a55192f58594838b8b3d2e7daaad43d3bf4293afab3dd8987d0bbd1124' ;; \\\r\n # i386\r\n-\t\ti386) pypyArch='linux32'; sha256='a6ceca9ee5dc511de7902164464b88311fec9366c5673d0c00528eda862bbe54' ;; \\\r\n+\t\ti386) pypyArch='linux32'; sha256='b04eeee5160e6cb5f8962de80f077ea1dc7be34e77d74bf075519c23603f5ff9' ;; \\\r\n \t\t*) echo >&2 \"error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release\"; exit 1 ;; \\\r\n \tesac; \\\r\n \t\\\r\ndiff --git a/pypy_slim/Dockerfile b/pypy_slim/Dockerfile\r\nindex 09eec9a..fe8a422 100644\r\n--- a/pypy_slim/Dockerfile\r\n+++ b/pypy_slim/Dockerfile\r\n@@ -15,10 +15,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \\\r\n \t\tlibsqlite3-0 \\\r\n \t&& rm -rf /var/lib/apt/lists/*\r\n \r\n-ENV PYPY_VERSION 5.10.1\r\n+ENV PYPY_VERSION 6.0.0\r\n \r\n # if this is called \"PIP_VERSION\", pip explodes with \"ValueError: invalid truth value '<VERSION>'\"\r\n-ENV PYTHON_PIP_VERSION 9.0.1\r\n+ENV PYTHON_PIP_VERSION 10.0.1\r\n \r\n RUN set -ex; \\\r\n \t\\\r\n@@ -26,11 +26,11 @@ RUN set -ex; \\\r\n \tdpkgArch=\"$(dpkg --print-architecture)\"; \\\r\n \tcase \"${dpkgArch##*-}\" in \\\r\n # amd64\r\n-\t\tamd64) pypyArch='linux64'; sha256='75a276e1ee1863967bbacb70c5bff636de200768c0ec90e72f7ec17aace0aefe' ;; \\\r\n+\t\tamd64) pypyArch='linux64'; sha256='4cfffa292b9ef34bb6ba39cdbaa196c5c5cbbc5aa3faaa157cf45d7e34027048' ;; \\\r\n # arm32v5\r\n-\t\tarmel) pypyArch='linux-armel'; sha256='5065e9ad958d06b9612ba974f43997d20168d4245c054dd43270e4b458782282' ;; \\\r\n+\t\tarmel) pypyArch='linux-armel'; sha256='6a6888a55192f58594838b8b3d2e7daaad43d3bf4293afab3dd8987d0bbd1124' ;; \\\r\n # i386\r\n-\t\ti386) pypyArch='linux32'; sha256='a6ceca9ee5dc511de7902164464b88311fec9366c5673d0c00528eda862bbe54' ;; \\\r\n+\t\ti386) pypyArch='linux32'; sha256='b04eeee5160e6cb5f8962de80f077ea1dc7be34e77d74bf075519c23603f5ff9' ;; \\\r\n \t\t*) echo >&2 \"error: current architecture ($dpkgArch) does not have a corresponding PyPy $PYPY_VERSION binary release\"; exit 1 ;; \\\r\n \tesac; \\\r\n \t\\\r\ndiff --git a/python_2-alpine/Dockerfile b/python_2-alpine/Dockerfile\r\nindex dea6408..289b616 100644\r\n--- a/python_2-alpine/Dockerfile\r\n+++ b/python_2-alpine/Dockerfile\r\n@@ -6,6 +6,8 @@ ENV PATH /usr/local/bin:$PATH\r\n # http://bugs.python.org/issue19846\r\n # > At the moment, setting \"LANG=C\" on a Linux system *fundamentally breaks Python 3*, and that's not OK.\r\n ENV LANG C.UTF-8\r\n+# https://github.com/docker-library/python/issues/147\r\n+ENV PYTHONIOENCODING UTF-8\r\n \r\n # install ca-certificates so that HTTPS works consistently\r\n # the other runtime dependencies for Python are installed later\r\ndiff --git a/python_2-alpine3.6/Dockerfile b/python_2-alpine3.6/Dockerfile\r\nindex d29950c..5ea78ae 100644\r\n--- a/python_2-alpine3.6/Dockerfile\r\n+++ b/python_2-alpine3.6/Dockerfile\r\n@@ -6,6 +6,8 @@ ENV PATH /usr/local/bin:$PATH\r\n # http://bugs.python.org/issue19846\r\n # > At the moment, setting \"LANG=C\" on a Linux system *fundamentally breaks Python 3*, and that's not OK.\r\n ENV LANG C.UTF-8\r\n+# https://github.com/docker-library/python/issues/147\r\n+ENV PYTHONIOENCODING UTF-8\r\n \r\n # install ca-certificates so that HTTPS works consistently\r\n # the other runtime dependencies for Python are installed later\r\ndiff --git a/python_2-alpine3.7/Dockerfile b/python_2-alpine3.7/Dockerfile\r\nindex b70a5c2..51db090 100644\r\n--- a/python_2-alpine3.7/Dockerfile\r\n+++ b/python_2-alpine3.7/Dockerfile\r\n@@ -6,6 +6,8 @@ ENV PATH /usr/local/bin:$PATH\r\n # http://bugs.python.org/issue19846\r\n # > At the moment, setting \"LANG=C\" on a Linux system *fundamentally breaks Python 3*, and that's not OK.\r\n ENV LANG C.UTF-8\r\n+# https://github.com/docker-library/python/issues/147\r\n+ENV PYTHONIOENCODING UTF-8\r\n \r\n # install ca-certificates so that HTTPS works consistently\r\n # the other runtime dependencies for Python are installed later\r\ndiff --git a/python_2-jessie/Dockerfile b/python_2-jessie/Dockerfile\r\nindex 931a9dc..59e3b44 100644\r\n--- a/python_2-jessie/Dockerfile\r\n+++ b/python_2-jessie/Dockerfile\r\n@@ -6,6 +6,8 @@ ENV PATH /usr/local/bin:$PATH\r\n # http://bugs.python.org/issue19846\r\n # > At the moment, setting \"LANG=C\" on a Linux system *fundamentally breaks Python 3*, and that's not OK.\r\n ENV LANG C.UTF-8\r\n+# https://github.com/docker-library/python/issues/147\r\n+ENV PYTHONIOENCODING UTF-8\r\n \r\n # runtime dependencies\r\n RUN apt-get update && apt-get install -y --no-install-recommends \\\r\ndiff --git a/python_2-slim-stretch/Dockerfile b/python_2-slim-stretch/Dockerfile\r\nindex a5ca565..1343998 100644\r\n--- a/python_2-slim-stretch/Dockerfile\r\n+++ b/python_2-slim-stretch/Dockerfile\r\n@@ -6,6 +6,8 @@ ENV PATH /usr/local/bin:$PATH\r\n # http://bugs.python.org/issue19846\r\n # > At the moment, setting \"LANG=C\" on a Linux system *fundamentally breaks Python 3*, and that's not OK.\r\n ENV LANG C.UTF-8\r\n+# https://github.com/docker-library/python/issues/147\r\n+ENV PYTHONIOENCODING UTF-8\r\n \r\n # runtime dependencies\r\n RUN apt-get update && apt-get install -y --no-install-recommends \\\r\ndiff --git a/python_2-slim/Dockerfile b/python_2-slim/Dockerfile\r\nindex da39931..3a10d57 100644\r\n--- a/python_2-slim/Dockerfile\r\n+++ b/python_2-slim/Dockerfile\r\n@@ -6,6 +6,8 @@ ENV PATH /usr/local/bin:$PATH\r\n # http://bugs.python.org/issue19846\r\n # > At the moment, setting \"LANG=C\" on a Linux system *fundamentally breaks Python 3*, and that's not OK.\r\n ENV LANG C.UTF-8\r\n+# https://github.com/docker-library/python/issues/147\r\n+ENV PYTHONIOENCODING UTF-8\r\n \r\n # runtime dependencies\r\n RUN apt-get update && apt-get install -y --no-install-recommends \\\r\ndiff --git a/python_2-stretch/Dockerfile b/python_2-stretch/Dockerfile\r\nindex ee480c3..e85ceee 100644\r\n--- a/python_2-stretch/Dockerfile\r\n+++ b/python_2-stretch/Dockerfile\r\n@@ -6,6 +6,8 @@ ENV PATH /usr/local/bin:$PATH\r\n # http://bugs.python.org/issue19846\r\n # > At the moment, setting \"LANG=C\" on a Linux system *fundamentally breaks Python 3*, and that's not OK.\r\n ENV LANG C.UTF-8\r\n+# https://github.com/docker-library/python/issues/147\r\n+ENV PYTHONIOENCODING UTF-8\r\n \r\n # runtime dependencies\r\n RUN apt-get update && apt-get install -y --no-install-recommends \\\r\ndiff --git a/python_2-wheezy/Dockerfile b/python_2-wheezy/Dockerfile\r\nindex 9515ddf..eb92bcd 100644\r\n--- a/python_2-wheezy/Dockerfile\r\n+++ b/python_2-wheezy/Dockerfile\r\n@@ -6,6 +6,8 @@ ENV PATH /usr/local/bin:$PATH\r\n # http://bugs.python.org/issue19846\r\n # > At the moment, setting \"LANG=C\" on a Linux system *fundamentally breaks Python 3*, and that's not OK.\r\n ENV LANG C.UTF-8\r\n+# https://github.com/docker-library/python/issues/147\r\n+ENV PYTHONIOENCODING UTF-8\r\n \r\n # runtime dependencies\r\n RUN apt-get update && apt-get install -y --no-install-recommends \\\r\ndiff --git a/python_2-windowsservercore-1709/Dockerfile b/python_2-windowsservercore-1709/Dockerfile\r\nindex 815ceb0..df1fc86 100644\r\n--- a/python_2-windowsservercore-1709/Dockerfile\r\n+++ b/python_2-windowsservercore-1709/Dockerfile\r\n@@ -7,6 +7,7 @@ ENV PYTHON_RELEASE 2.7.14\r\n \r\n RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}.amd64.msi' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \\\r\n \tWrite-Host ('Downloading {0} ...' -f $url); \\\r\n+\t[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \\\r\n \tInvoke-WebRequest -Uri $url -OutFile 'python.msi'; \\\r\n \t\\\r\n \tWrite-Host 'Installing ...'; \\\r\ndiff --git a/python_2-windowsservercore-ltsc2016/Dockerfile b/python_2-windowsservercore-ltsc2016/Dockerfile\r\nindex adf0ab7..adc673b 100644\r\n--- a/python_2-windowsservercore-ltsc2016/Dockerfile\r\n+++ b/python_2-windowsservercore-ltsc2016/Dockerfile\r\n@@ -7,6 +7,7 @@ ENV PYTHON_RELEASE 2.7.14\r\n \r\n RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}.amd64.msi' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \\\r\n \tWrite-Host ('Downloading {0} ...' -f $url); \\\r\n+\t[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \\\r\n \tInvoke-WebRequest -Uri $url -OutFile 'python.msi'; \\\r\n \t\\\r\n \tWrite-Host 'Installing ...'; \\\r\ndiff --git a/python_rc-windowsservercore-1709/Dockerfile b/python_rc-windowsservercore-1709/Dockerfile\r\nindex 2be2f06..3d20988 100644\r\n--- a/python_rc-windowsservercore-1709/Dockerfile\r\n+++ b/python_rc-windowsservercore-1709/Dockerfile\r\n@@ -13,6 +13,7 @@ ENV PYTHON_RELEASE 3.7.0\r\n \r\n RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \\\r\n \tWrite-Host ('Downloading {0} ...' -f $url); \\\r\n+\t[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \\\r\n \tInvoke-WebRequest -Uri $url -OutFile 'python.exe'; \\\r\n \t\\\r\n \tWrite-Host 'Installing ...'; \\\r\ndiff --git a/python_rc-windowsservercore-ltsc2016/Dockerfile b/python_rc-windowsservercore-ltsc2016/Dockerfile\r\nindex 02463bc..cea305f 100644\r\n--- a/python_rc-windowsservercore-ltsc2016/Dockerfile\r\n+++ b/python_rc-windowsservercore-ltsc2016/Dockerfile\r\n@@ -13,6 +13,7 @@ ENV PYTHON_RELEASE 3.7.0\r\n \r\n RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \\\r\n \tWrite-Host ('Downloading {0} ...' -f $url); \\\r\n+\t[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \\\r\n \tInvoke-WebRequest -Uri $url -OutFile 'python.exe'; \\\r\n \t\\\r\n \tWrite-Host 'Installing ...'; \\\r\ndiff --git a/python_windowsservercore-1709/Dockerfile b/python_windowsservercore-1709/Dockerfile\r\nindex 8a458d7..1507edf 100644\r\n--- a/python_windowsservercore-1709/Dockerfile\r\n+++ b/python_windowsservercore-1709/Dockerfile\r\n@@ -13,6 +13,7 @@ ENV PYTHON_RELEASE 3.6.5\r\n \r\n RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \\\r\n \tWrite-Host ('Downloading {0} ...' -f $url); \\\r\n+\t[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \\\r\n \tInvoke-WebRequest -Uri $url -OutFile 'python.exe'; \\\r\n \t\\\r\n \tWrite-Host 'Installing ...'; \\\r\ndiff --git a/python_windowsservercore-ltsc2016/Dockerfile b/python_windowsservercore-ltsc2016/Dockerfile\r\nindex 5252881..c1c0833 100644\r\n--- a/python_windowsservercore-ltsc2016/Dockerfile\r\n+++ b/python_windowsservercore-ltsc2016/Dockerfile\r\n@@ -13,6 +13,7 @@ ENV PYTHON_RELEASE 3.6.5\r\n \r\n RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \\\r\n \tWrite-Host ('Downloading {0} ...' -f $url); \\\r\n+\t[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \\\r\n \tInvoke-WebRequest -Uri $url -OutFile 'python.exe'; \\\r\n \t\\\r\n \tWrite-Host 'Installing ...'; \\\r\n````\r\n\r\n</details>"}}
{"actor":{"display_login":"tianon"}}