Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update docker-library images #2159

Merged
merged 1 commit into from
Sep 20, 2016
Merged

Update docker-library images #2159

merged 1 commit into from
Sep 20, 2016

Conversation

tianon
Copy link
Member

@tianon tianon commented Sep 19, 2016

@tianon
Update docker-library images
3f9a4e0 
- `gcc`: explicitly support 4.9 (4.9.4), 5 (5.4.0), and 6 (6.2.0) tracks as upstream does (docker-library/gcc#29)
- `kibana`: remove 4.0 (EOL)
- `tomcat`: 7.0.72
- `wordpress`: fix escaping issues, especially for values starting with `-` (docker-library/wordpress#172)
@tianon
Copy link
Member Author

tianon commented Sep 19, 2016 

diff --git a/gcc_5/Dockerfile b/gcc_4/Dockerfile
similarity index 96%
copy from gcc_5/Dockerfile
copy to gcc_4/Dockerfile
index 46068c0..474c452 100644
--- a/gcc_5/Dockerfile
+++ b/gcc_4/Dockerfile
@@ -13,9 +13,9 @@ RUN set -xe \
        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
    done

-# Last Modified: 2015-12-04
-ENV GCC_VERSION 5.3.0
-# Docker EOL: 2016-12-04
+# Last Modified: 2016-08-03
+ENV GCC_VERSION 4.9.4
+# Docker EOL: 2017-08-03

 # "download_prerequisites" pulls down a bunch of tarballs and extracts them,
 # but then leaves the tarballs themselves lying around
diff --git a/gcc_5/Dockerfile b/gcc_5/Dockerfile
index 46068c0..bb1e247 100644
--- a/gcc_5/Dockerfile
+++ b/gcc_5/Dockerfile
@@ -13,9 +13,9 @@ RUN set -xe \
        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
    done

-# Last Modified: 2015-12-04
-ENV GCC_VERSION 5.3.0
-# Docker EOL: 2016-12-04
+# Last Modified: 2016-06-03
+ENV GCC_VERSION 5.4.0
+# Docker EOL: 2017-06-03

 # "download_prerequisites" pulls down a bunch of tarballs and extracts them,
 # but then leaves the tarballs themselves lying around
diff --git a/gcc_latest/Dockerfile b/gcc_latest/Dockerfile
index e2169b2..59ef5e9 100644
--- a/gcc_latest/Dockerfile
+++ b/gcc_latest/Dockerfile
@@ -13,9 +13,9 @@ RUN set -xe \
        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
    done

-# Last Modified: 2016-04-27
-ENV GCC_VERSION 6.1.0
-# Docker EOL: 2017-04-27
+# Last Modified: 2016-08-22
+ENV GCC_VERSION 6.2.0
+# Docker EOL: 2017-08-22

 # "download_prerequisites" pulls down a bunch of tarballs and extracts them,
 # but then leaves the tarballs themselves lying around
diff --git a/kibana_4.0/Dockerfile b/kibana_4.0/Dockerfile
deleted file mode 100644
index 51d7d10..0000000
diff --git a/kibana_4.0/docker-entrypoint.sh b/kibana_4.0/docker-entrypoint.sh
deleted file mode 100755
index 91c663c..0000000
diff --git a/tomcat_7-alpine/Dockerfile b/tomcat_7-alpine/Dockerfile
index 7bc6f8e..fcc0c53 100644
--- a/tomcat_7-alpine/Dockerfile
+++ b/tomcat_7-alpine/Dockerfile
@@ -32,7 +32,7 @@ RUN set -ex \
    done

 ENV TOMCAT_MAJOR 7
-ENV TOMCAT_VERSION 7.0.70
+ENV TOMCAT_VERSION 7.0.72
 ENV TOMCAT_TGZ_URL https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz

 RUN set -x \
diff --git a/tomcat_7-jre8-alpine/Dockerfile b/tomcat_7-jre8-alpine/Dockerfile
index da516a5..50c085a 100644
--- a/tomcat_7-jre8-alpine/Dockerfile
+++ b/tomcat_7-jre8-alpine/Dockerfile
@@ -32,7 +32,7 @@ RUN set -ex \
    done

 ENV TOMCAT_MAJOR 7
-ENV TOMCAT_VERSION 7.0.70
+ENV TOMCAT_VERSION 7.0.72
 ENV TOMCAT_TGZ_URL https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz

 RUN set -x \
diff --git a/tomcat_7-jre8/Dockerfile b/tomcat_7-jre8/Dockerfile
index 8437389..813b714 100644
--- a/tomcat_7-jre8/Dockerfile
+++ b/tomcat_7-jre8/Dockerfile
@@ -53,7 +53,7 @@ RUN set -ex \
    done

 ENV TOMCAT_MAJOR 7
-ENV TOMCAT_VERSION 7.0.70
+ENV TOMCAT_VERSION 7.0.72
 ENV TOMCAT_TGZ_URL https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz

 RUN set -x \
diff --git a/tomcat_7/Dockerfile b/tomcat_7/Dockerfile
index 15cfa9b..c560c3a 100644
--- a/tomcat_7/Dockerfile
+++ b/tomcat_7/Dockerfile
@@ -53,7 +53,7 @@ RUN set -ex \
    done

 ENV TOMCAT_MAJOR 7
-ENV TOMCAT_VERSION 7.0.70
+ENV TOMCAT_VERSION 7.0.72
 ENV TOMCAT_TGZ_URL https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz

 RUN set -x \
diff --git a/wordpress_fpm/docker-entrypoint.sh b/wordpress_fpm/docker-entrypoint.sh
index 5751d6d..4f55ae3 100755
--- a/wordpress_fpm/docker-entrypoint.sh
+++ b/wordpress_fpm/docker-entrypoint.sh
@@ -50,7 +50,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
    # version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
    # https://github.com/docker-library/wordpress/issues/116
    # https://github.com/WordPress/WordPress/commit/1acedc542fba2482bab88ec70d4bea4b997a92e4
-   sed -ri 's/\r\n|\r/\n/g' wp-config*
+   sed -ri -e 's/\r\n|\r/\n/g' wp-config*

    if [ ! -e wp-config.php ]; then
        awk '/^\/\*.*stop editing.*\*\/$/ && c == 0 { c = 1; system("cat") } { print }' wp-config-sample.php > wp-config.php <<'EOPHP'
@@ -66,13 +66,13 @@ EOPHP

    # see http://stackoverflow.com/a/2705678/433558
    sed_escape_lhs() {
-       echo "$@" | sed 's/[]\/$*.^|[]/\\&/g'
+       echo "$@" | sed -e 's/[]\/$*.^|[]/\\&/g'
    }
    sed_escape_rhs() {
-       echo "$@" | sed 's/[\/&]/\\&/g'
+       echo "$@" | sed -e 's/[\/&]/\\&/g'
    }
    php_escape() {
-       php -r 'var_export(('$2') $argv[1]);' "$1"
+       php -r 'var_export(('$2') $argv[1]);' -- "$1"
    }
    set_config() {
        key="$1"
@@ -84,7 +84,7 @@ EOPHP
            start="^(\s*)$(sed_escape_lhs "$key")\s*="
            end=";"
        fi
-       sed -ri "s/($start\s*).*($end)$/\1$(sed_escape_rhs "$(php_escape "$value" "$var_type")")\3/" wp-config.php
+       sed -ri -e "s/($start\s*).*($end)$/\1$(sed_escape_rhs "$(php_escape "$value" "$var_type")")\3/" wp-config.php
    }

    set_config 'DB_HOST' "$WORDPRESS_DB_HOST"
@@ -110,7 +110,7 @@ EOPHP
            set_config "$unique" "$unique_value"
        else
            # if not specified, let's generate a random value
-           current_set="$(sed -rn "s/define\((([\'\"])$unique\2\s*,\s*)(['\"])(.*)\3\);/\4/p" wp-config.php)"
+           current_set="$(sed -rn -e "s/define\((([\'\"])$unique\2\s*,\s*)(['\"])(.*)\3\);/\4/p" wp-config.php)"
            if [ "$current_set" = 'put your unique phrase here' ]; then
                set_config "$unique" "$(head -c1M /dev/urandom | sha1sum | cut -d' ' -f1)"
            fi
diff --git a/wordpress_latest/docker-entrypoint.sh b/wordpress_latest/docker-entrypoint.sh
index 5751d6d..4f55ae3 100755
--- a/wordpress_latest/docker-entrypoint.sh
+++ b/wordpress_latest/docker-entrypoint.sh
@@ -50,7 +50,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
    # version 4.4.1 decided to switch to windows line endings, that breaks our seds and awks
    # https://github.com/docker-library/wordpress/issues/116
    # https://github.com/WordPress/WordPress/commit/1acedc542fba2482bab88ec70d4bea4b997a92e4
-   sed -ri 's/\r\n|\r/\n/g' wp-config*
+   sed -ri -e 's/\r\n|\r/\n/g' wp-config*

    if [ ! -e wp-config.php ]; then
        awk '/^\/\*.*stop editing.*\*\/$/ && c == 0 { c = 1; system("cat") } { print }' wp-config-sample.php > wp-config.php <<'EOPHP'
@@ -66,13 +66,13 @@ EOPHP

    # see http://stackoverflow.com/a/2705678/433558
    sed_escape_lhs() {
-       echo "$@" | sed 's/[]\/$*.^|[]/\\&/g'
+       echo "$@" | sed -e 's/[]\/$*.^|[]/\\&/g'
    }
    sed_escape_rhs() {
-       echo "$@" | sed 's/[\/&]/\\&/g'
+       echo "$@" | sed -e 's/[\/&]/\\&/g'
    }
    php_escape() {
-       php -r 'var_export(('$2') $argv[1]);' "$1"
+       php -r 'var_export(('$2') $argv[1]);' -- "$1"
    }
    set_config() {
        key="$1"
@@ -84,7 +84,7 @@ EOPHP
            start="^(\s*)$(sed_escape_lhs "$key")\s*="
            end=";"
        fi
-       sed -ri "s/($start\s*).*($end)$/\1$(sed_escape_rhs "$(php_escape "$value" "$var_type")")\3/" wp-config.php
+       sed -ri -e "s/($start\s*).*($end)$/\1$(sed_escape_rhs "$(php_escape "$value" "$var_type")")\3/" wp-config.php
    }

    set_config 'DB_HOST' "$WORDPRESS_DB_HOST"
@@ -110,7 +110,7 @@ EOPHP
            set_config "$unique" "$unique_value"
        else
            # if not specified, let's generate a random value
-           current_set="$(sed -rn "s/define\((([\'\"])$unique\2\s*,\s*)(['\"])(.*)\3\);/\4/p" wp-config.php)"
+           current_set="$(sed -rn -e "s/define\((([\'\"])$unique\2\s*,\s*)(['\"])(.*)\3\);/\4/p" wp-config.php)"
            if [ "$current_set" = 'put your unique phrase here' ]; then
                set_config "$unique" "$(head -c1M /dev/urandom | sha1sum | cut -d' ' -f1)"
            fi

@tianon
Copy link
Member Author

tianon commented Sep 20, 2016

Build test of #2159; 3f9a4e0 (gcc, kibana, tomcat, wordpress):

$ bashbrew build gcc:4.9.4
Using bashbrew/cache:cfa936280a92ddde7692b7d7ce3af87352189bebebda73b1382ced0bb36d70f9 (gcc:4.9.4)
Tagging gcc:4.9.4
Tagging gcc:4.9
Tagging gcc:4

$ test/run.sh gcc:4.9.4
testing gcc:4.9.4
    'utc' [1/7]...passed
    'cve-2014--shellshock' [2/7]...passed
    'no-hard-coded-passwords' [3/7]...passed
    'override-cmd' [4/7]...passed
    'gcc-c-hello-world' [5/7]...passed
    'gcc-cpp-hello-world' [6/7]...passed
    'golang-hello-world' [7/7]...docker: Error response from daemon: Container command 'go' not found or does not exist..
failed


$ bashbrew build gcc:5.4.0
Using bashbrew/cache:c002c910f44c44ca4c0a7108ed02be7c44ad756eeaf8c3b6ad79b18e78e01c5a (gcc:5.4.0)
Tagging gcc:5.4.0
Tagging gcc:5.4
Tagging gcc:5

$ test/run.sh gcc:5.4.0
testing gcc:5.4.0
    'utc' [1/7]...passed
    'cve-2014--shellshock' [2/7]...passed
    'no-hard-coded-passwords' [3/7]...passed
    'override-cmd' [4/7]...passed
    'gcc-c-hello-world' [5/7]...passed
    'gcc-cpp-hello-world' [6/7]...passed
    'golang-hello-world' [7/7]...passed


$ bashbrew build gcc:6.2.0
Using bashbrew/cache:262deb37df10f7c877df957141718bd197e822da658472f6f9e666a4a3db5d11 (gcc:6.2.0)
Tagging gcc:6.2.0
Tagging gcc:6.2
Tagging gcc:6
Tagging gcc:latest

$ test/run.sh gcc:6.2.0
testing gcc:6.2.0
    'utc' [1/7]...passed
    'cve-2014--shellshock' [2/7]...passed
    'no-hard-coded-passwords' [3/7]...passed
    'override-cmd' [4/7]...passed
    'gcc-c-hello-world' [5/7]...passed
    'gcc-cpp-hello-world' [6/7]...passed
    'golang-hello-world' [7/7]...passed

$ bashbrew build kibana:4.1.11
Using bashbrew/cache:eb14d538dd230dac5629ecffb52e0ff802c4b2943fd4a9694cb77d084ff592e9 (kibana:4.1.11)
Tagging kibana:4.1.11
Tagging kibana:4.1

$ test/run.sh kibana:4.1.11
testing kibana:4.1.11
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed


$ bashbrew build kibana:4.2.2
Using bashbrew/cache:688b0883e363f8caf2ed876c126139719a41f634d6867c263c88df39fb447f81 (kibana:4.2.2)
Tagging kibana:4.2.2
Tagging kibana:4.2

$ test/run.sh kibana:4.2.2
testing kibana:4.2.2
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed


$ bashbrew build kibana:4.3.3
Using bashbrew/cache:be4d2c091b79df261a86e837c3d9214476aad0439620e3e6ce812560bef2deb6 (kibana:4.3.3)
Tagging kibana:4.3.3
Tagging kibana:4.3

$ test/run.sh kibana:4.3.3
testing kibana:4.3.3
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed


$ bashbrew build kibana:4.4.2
Using bashbrew/cache:7ffbfae215fb9d6f90c89e7f5396d7ee34f373547631aa4426b62d76474bd2c0 (kibana:4.4.2)
Tagging kibana:4.4.2
Tagging kibana:4.4

$ test/run.sh kibana:4.4.2
testing kibana:4.4.2
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed


$ bashbrew build kibana:4.5.4
Using bashbrew/cache:64854da2d678ab1b46429aed94e0265386afaef46d6c7c3cc322f0d88f7f4898 (kibana:4.5.4)
Tagging kibana:4.5.4
Tagging kibana:4.5

$ test/run.sh kibana:4.5.4
testing kibana:4.5.4
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed


$ bashbrew build kibana:4.6.1
Using bashbrew/cache:e56ae99d28272ddb142e0acbd14bfb63a25fad33e390e07b83b366d2d3040de2 (kibana:4.6.1)
Tagging kibana:4.6.1
Tagging kibana:4.6
Tagging kibana:4
Tagging kibana:latest

$ test/run.sh kibana:4.6.1
testing kibana:4.6.1
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed


$ bashbrew build kibana:5.0.0-alpha5
Using bashbrew/cache:e1700ce3f7eb6932a11d655507b6b40b0e010d3a6151dfd7111506ff6c5a5929 (kibana:5.0.0-alpha5)
Tagging kibana:5.0.0-alpha5
Tagging kibana:5.0.0
Tagging kibana:5.0
Tagging kibana:5

$ test/run.sh kibana:5.0.0-alpha5
testing kibana:5.0.0-alpha5
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed

$ bashbrew build tomcat:6.0.45-jre7
Using bashbrew/cache:661ddd183ca4c30bbc4b718775b286c4e3ed323d3990e4f1fb27cc2e6c4311e6 (tomcat:6.0.45-jre7)
Tagging tomcat:6.0.45-jre7
Tagging tomcat:6.0-jre7
Tagging tomcat:6-jre7
Tagging tomcat:6.0.45
Tagging tomcat:6.0
Tagging tomcat:6

$ test/run.sh tomcat:6.0.45-jre7
testing tomcat:6.0.45-jre7
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:6.0.45-jre8
Using bashbrew/cache:0aceba6f6dd5085c8bd0fca9bf58a7c965d855f1cbf3795808681b1af3cd3f2c (tomcat:6.0.45-jre8)
Tagging tomcat:6.0.45-jre8
Tagging tomcat:6.0-jre8
Tagging tomcat:6-jre8

$ test/run.sh tomcat:6.0.45-jre8
testing tomcat:6.0.45-jre8
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.72-jre7
Using bashbrew/cache:dd61e5b3fe43a08809ebaf05bdd151aeb2b75d3f96d10c03ea1f3988fb9e2edf (tomcat:7.0.72-jre7)
Tagging tomcat:7.0.72-jre7
Tagging tomcat:7.0-jre7
Tagging tomcat:7-jre7
Tagging tomcat:7.0.72
Tagging tomcat:7.0
Tagging tomcat:7

$ test/run.sh tomcat:7.0.72-jre7
testing tomcat:7.0.72-jre7
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.72-jre7-alpine
Using bashbrew/cache:6b44f586f453c06069c60b1ef4d3be474dae6d0fab700260063ee08723b3b88a (tomcat:7.0.72-jre7-alpine)
Tagging tomcat:7.0.72-jre7-alpine
Tagging tomcat:7.0-jre7-alpine
Tagging tomcat:7-jre7-alpine
Tagging tomcat:7.0.72-alpine
Tagging tomcat:7.0-alpine
Tagging tomcat:7-alpine

$ test/run.sh tomcat:7.0.72-jre7-alpine
testing tomcat:7.0.72-jre7-alpine
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.72-jre8
Using bashbrew/cache:f12a0a5fc3078f530236e7b0a03df18ec92e5b56274191d2849f5c0968c9f943 (tomcat:7.0.72-jre8)
Tagging tomcat:7.0.72-jre8
Tagging tomcat:7.0-jre8
Tagging tomcat:7-jre8

$ test/run.sh tomcat:7.0.72-jre8
testing tomcat:7.0.72-jre8
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:7.0.72-jre8-alpine
Using bashbrew/cache:1776778e38e66c8e5a7ad1300c3cf920375fd0ef14c0d412b542e6054325a279 (tomcat:7.0.72-jre8-alpine)
Tagging tomcat:7.0.72-jre8-alpine
Tagging tomcat:7.0-jre8-alpine
Tagging tomcat:7-jre8-alpine

$ test/run.sh tomcat:7.0.72-jre8-alpine
testing tomcat:7.0.72-jre8-alpine
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.0.37-jre7
Using bashbrew/cache:b63c74f88196752d4512342168f732e4b085d6e48a7d1909c40c32a0315db4f4 (tomcat:8.0.37-jre7)
Tagging tomcat:8.0.37-jre7
Tagging tomcat:8.0-jre7
Tagging tomcat:8-jre7
Tagging tomcat:jre7
Tagging tomcat:8.0.37
Tagging tomcat:8.0
Tagging tomcat:8
Tagging tomcat:latest

$ test/run.sh tomcat:8.0.37-jre7
testing tomcat:8.0.37-jre7
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.0.37-jre7-alpine
Using bashbrew/cache:91c7d43de5191235c8bec8e17a67dda90ec54280df4858e40b3f8619fa3aeafc (tomcat:8.0.37-jre7-alpine)
Tagging tomcat:8.0.37-jre7-alpine
Tagging tomcat:8.0-jre7-alpine
Tagging tomcat:8-jre7-alpine
Tagging tomcat:jre7-alpine
Tagging tomcat:8.0.37-alpine
Tagging tomcat:8.0-alpine
Tagging tomcat:8-alpine
Tagging tomcat:alpine

$ test/run.sh tomcat:8.0.37-jre7-alpine
testing tomcat:8.0.37-jre7-alpine
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.0.37-jre8
Using bashbrew/cache:d31b18c7d69233e7a72c16978985d52133dcc8f4c0898d8a8a0b5e5cf424bf85 (tomcat:8.0.37-jre8)
Tagging tomcat:8.0.37-jre8
Tagging tomcat:8.0-jre8
Tagging tomcat:8-jre8
Tagging tomcat:jre8

$ test/run.sh tomcat:8.0.37-jre8
testing tomcat:8.0.37-jre8
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.0.37-jre8-alpine
Using bashbrew/cache:2d3cc6e1c0306aecf3578961e6da34887ab39aebde2209e0ad14e32a507f05ea (tomcat:8.0.37-jre8-alpine)
Tagging tomcat:8.0.37-jre8-alpine
Tagging tomcat:8.0-jre8-alpine
Tagging tomcat:8-jre8-alpine
Tagging tomcat:jre8-alpine

$ test/run.sh tomcat:8.0.37-jre8-alpine
testing tomcat:8.0.37-jre8-alpine
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.5.5-jre8
Using bashbrew/cache:d9e706e18db985def3bf152badc16e1babc1b44a161d84f2ff2f93476a3d7e17 (tomcat:8.5.5-jre8)
Tagging tomcat:8.5.5-jre8
Tagging tomcat:8.5-jre8
Tagging tomcat:8.5.5
Tagging tomcat:8.5

$ test/run.sh tomcat:8.5.5-jre8
testing tomcat:8.5.5-jre8
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:8.5.5-jre8-alpine
Using bashbrew/cache:eb7da8a5b9de10eb3de6d41a6a41d833f74d4bf405cf6c5e0fbebfd5e2e200dd (tomcat:8.5.5-jre8-alpine)
Tagging tomcat:8.5.5-jre8-alpine
Tagging tomcat:8.5-jre8-alpine
Tagging tomcat:8.5.5-alpine
Tagging tomcat:8.5-alpine

$ test/run.sh tomcat:8.5.5-jre8-alpine
testing tomcat:8.5.5-jre8-alpine
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:9.0.0.M10-jre8
Using bashbrew/cache:0cc6540282e82aa1ba9ad4fe6b7573661b0e539a10b661478c83e92847f23ba1 (tomcat:9.0.0.M10-jre8)
Tagging tomcat:9.0.0.M10-jre8
Tagging tomcat:9.0.0-jre8
Tagging tomcat:9.0-jre8
Tagging tomcat:9-jre8
Tagging tomcat:9.0.0.M10
Tagging tomcat:9.0.0
Tagging tomcat:9.0
Tagging tomcat:9

$ test/run.sh tomcat:9.0.0.M10-jre8
testing tomcat:9.0.0.M10-jre8
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed


$ bashbrew build tomcat:9.0.0.M10-jre8-alpine
Using bashbrew/cache:68bf1735afa7ff04904377d0a2d0effaeee76391c36413f605a53a6bdc8f2a5c (tomcat:9.0.0.M10-jre8-alpine)
Tagging tomcat:9.0.0.M10-jre8-alpine
Tagging tomcat:9.0.0-jre8-alpine
Tagging tomcat:9.0-jre8-alpine
Tagging tomcat:9-jre8-alpine
Tagging tomcat:9.0.0.M10-alpine
Tagging tomcat:9.0.0-alpine
Tagging tomcat:9.0-alpine
Tagging tomcat:9-alpine

$ test/run.sh tomcat:9.0.0.M10-jre8-alpine
testing tomcat:9.0.0.M10-jre8-alpine
    'utc' [1/5]...passed
    'cve-2014--shellshock' [2/5]...passed
    'no-hard-coded-passwords' [3/5]...passed
    'override-cmd' [4/5]...passed
    'tomcat-hello-world' [5/5]....passed

$ bashbrew build wordpress:4.6.1-apache
Using bashbrew/cache:b7a3cac1216052bfb46bde0de359a61a232b2c0d1eabbc929d9a72bac87c96f9 (wordpress:4.6.1-apache)
Tagging wordpress:4.6.1-apache
Tagging wordpress:4.6-apache
Tagging wordpress:4-apache
Tagging wordpress:apache
Tagging wordpress:4.6.1
Tagging wordpress:4.6
Tagging wordpress:4
Tagging wordpress:latest

$ test/run.sh wordpress:4.6.1-apache
testing wordpress:4.6.1-apache
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed


$ bashbrew build wordpress:4.6.1-fpm
Using bashbrew/cache:bd4bf6831ed3b59478afabb5fbfee3bc5d514dd5237f51c61f3263204260685c (wordpress:4.6.1-fpm)
Tagging wordpress:4.6.1-fpm
Tagging wordpress:4.6-fpm
Tagging wordpress:4-fpm
Tagging wordpress:fpm

$ test/run.sh wordpress:4.6.1-fpm
testing wordpress:4.6.1-fpm
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed

The following images failed at least one test: gcc:4.9.4

Failing test fix is over in #2161. 👍

@yosifkit yosifkit merged commit c4cd2cd into docker-library:master Sep 20, 2016
@yosifkit yosifkit deleted the update-docker-library branch September 20, 2016 00:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/gcc library/kibana library/tomcat library/wordpress
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tianon @yosifkit @docker-library-bot