Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
juanluisbaptiste committed Dec 16, 2015
2 parents b64cb46 + 0a2c8e8 commit c365d82
Show file tree
Hide file tree
Showing 17 changed files with 157 additions and 144 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ The `Dockerfile` should be written to help mitigate man-in-the-middle attacks du
# ...
```

(As a side note, `rm -rf /var/lib/apt/lists/*` is *roughly* the opposite of `apt-get update` -- it ensures that the layer doesn't include the extra ~8MB of APT package list data, and enforces [appropriate `apt-get update` usage](https://docs.docker.com/articles/dockerfile_best-practices/#run).)
(As a side note, `rm -rf /var/lib/apt/lists/*` is *roughly* the opposite of `apt-get update` -- it ensures that the layer doesn't include the extra ~8MB of APT package list data, and enforces [appropriate `apt-get update` usage](https://docs.docker.com/engine/articles/dockerfile_best-practices/#apt-get).)

- **Alternate Best**: *full key fingerprint import, download over https, verify gpg signature of download.*

Expand Down
12 changes: 6 additions & 6 deletions library/alpine
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# maintainer: Glider Labs <team@gliderlabs.com> (@gliderlabs)

2.6: git://github.com/gliderlabs/docker-alpine@c369eb24b9cd81149b355fc785173e3dde098001 versions/library-2.6
2.6: git://github.com/gliderlabs/docker-alpine@f27ced81798c73df17a55183da25fd23c7708483 versions/library-2.6

2.7: git://github.com/gliderlabs/docker-alpine@19859598cbba40c4b8851339164c3998694dee65 versions/library-2.7
2.7: git://github.com/gliderlabs/docker-alpine@1196c49608d4e9778ea5e883d794cec2f50f326e versions/library-2.7

3.1: git://github.com/gliderlabs/docker-alpine@1a65d4ea2ceb1db6d1579c99226a0858c45563ce versions/library-3.1
3.1: git://github.com/gliderlabs/docker-alpine@a3885a61b55a6f15835e5bbb7612f239776902a9 versions/library-3.1

3.2: git://github.com/gliderlabs/docker-alpine@7621dffecfb794a7639dabb468732102e6f265bb versions/library-3.2
latest: git://github.com/gliderlabs/docker-alpine@7621dffecfb794a7639dabb468732102e6f265bb versions/library-3.2
3.2: git://github.com/gliderlabs/docker-alpine@b0549af94764986cec43e5f8ccb3458b425f535f versions/library-3.2
latest: git://github.com/gliderlabs/docker-alpine@b0549af94764986cec43e5f8ccb3458b425f535f versions/library-3.2

edge: git://github.com/gliderlabs/docker-alpine@16384184f6870fa786e7dc590bf9fdbddee77bd7 versions/library-edge
edge: git://github.com/gliderlabs/docker-alpine@da7426c081baa48b4c610d699541acd310371b29 versions/library-edge
13 changes: 9 additions & 4 deletions library/centos
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# maintainer: The CentOS Project <cloud-ops@centos.org> (@CentOS)
# Build date 20150904
# Build date 20151215

# CentOS 7 rolling builds
latest: git://github.com/CentOS/sig-cloud-instance-images@281559d6864e84fe365ef4007d4db27c197b50fb docker
centos7: git://github.com/CentOS/sig-cloud-instance-images@281559d6864e84fe365ef4007d4db27c197b50fb docker
7: git://github.com/CentOS/sig-cloud-instance-images@281559d6864e84fe365ef4007d4db27c197b50fb docker
latest: git://github.com/CentOS/sig-cloud-instance-images@93117754c2a3de3c91ab563022f592e7940d293a docker
centos7: git://github.com/CentOS/sig-cloud-instance-images@93117754c2a3de3c91ab563022f592e7940d293a docker
7: git://github.com/CentOS/sig-cloud-instance-images@93117754c2a3de3c91ab563022f592e7940d293a docker

# CentOS 6 rolling builds
centos6: git://github.com/CentOS/sig-cloud-instance-images@20732d1bb34a9aba45c1c6f41576ed6bf3d8c619 docker
Expand All @@ -15,6 +15,11 @@ centos5: git://github.com/CentOS/sig-cloud-instance-images@c8d1a81b0516bca0f2043
5: git://github.com/CentOS/sig-cloud-instance-images@c8d1a81b0516bca0f20434be8d0fac4f7d58a04a docker

## Minor tagged builds
#
#7.2.1511
centos7.2.1511: git://github.com/CentOS/sig-cloud-instance-images@a3c59bd4e98a7f9c063d993955c8ec19c5b1ceff docker
7.2.1511: git://github.com/CentOS/sig-cloud-instance-images@a3c59bd4e98a7f9c063d993955c8ec19c5b1ceff docker

#7.1.1503
centos7.1.1503: git://github.com/CentOS/sig-cloud-instance-images@bc561dfdd671d612dbb9f92e7e17dd8009befc44 docker
7.1.1503: git://github.com/CentOS/sig-cloud-instance-images@bc561dfdd671d612dbb9f92e7e17dd8009befc44 docker
Expand Down
35 changes: 19 additions & 16 deletions library/couchbase
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
# maintainer: Couchbase Docker Team <docker@couchbase.com> (@couchbase)

latest: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 enterprise/couchbase-server/4.0.0
enterprise: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 enterprise/couchbase-server/4.0.0
community: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 community/couchbase-server/4.0.0
latest: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/4.1.0
enterprise: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/4.1.0

4.0.0: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 enterprise/couchbase-server/4.0.0
enterprise-4.0.0: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 enterprise/couchbase-server/4.0.0
community-4.0.0: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 community/couchbase-server/4.0.0
4.1.0: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/4.1.0
enterprise-4.1.0: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/4.1.0

3.1.0: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 enterprise/couchbase-server/3.1.0
enterprise-3.1.0: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 enterprise/couchbase-server/3.1.0
4.0.0: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/4.0.0
enterprise-4.0.0: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/4.0.0
community-4.0.0: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 community/couchbase-server/4.0.0
community: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 community/couchbase-server/4.0.0

3.0.3: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 enterprise/couchbase-server/3.0.3
enterprise-3.0.3: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 enterprise/couchbase-server/3.0.3
3.1.0: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/3.1.0
enterprise-3.1.0: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/3.1.0

3.0.2: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 enterprise/couchbase-server/3.0.2
enterprise-3.0.2: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 enterprise/couchbase-server/3.0.2
3.0.3: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/3.0.3
enterprise-3.0.3: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/3.0.3

community-3.0.1: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 community/couchbase-server/3.0.1
3.0.2: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/3.0.2
enterprise-3.0.2: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/3.0.2

2.5.2: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 enterprise/couchbase-server/2.5.2
enterprise-2.5.2: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 enterprise/couchbase-server/2.5.2
community-3.0.1: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 community/couchbase-server/3.0.1

community-2.2.0: git://github.com/couchbase/docker@a997f494aae7d8fa572dbc581ab289e8eaa72279 community/couchbase-server/2.2.0
2.5.2: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/2.5.2
enterprise-2.5.2: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 enterprise/couchbase-server/2.5.2

community-2.2.0: git://github.com/couchbase/docker@7eb049d012eed3821ead1d8a728a07bf33db85a1 community/couchbase-server/2.2.0
4 changes: 2 additions & 2 deletions library/jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# maintainer: Michael Neale <mneale@cloudbees.com> (@michaelneale)
# maintainer: Carlos Sanchez <csanchez@cloudbees.com> (@carlossg)

latest: git://github.com/jenkinsci/jenkins-ci.org-docker@4fa9ebc13069fa8186728622cd63702cddf11162
1.625.2: git://github.com/jenkinsci/jenkins-ci.org-docker@4fa9ebc13069fa8186728622cd63702cddf11162
latest: git://github.com/jenkinsci/jenkins-ci.org-docker@83ce6f6070f1670563a00d0f61d04edd62b78f4f
1.625.3: git://github.com/jenkinsci/jenkins-ci.org-docker@83ce6f6070f1670563a00d0f61d04edd62b78f4f

4 changes: 2 additions & 2 deletions library/kaazing-gateway
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# maintainer: Kaazing Docker Maintainers </~https://github.com/kaazing/gateway.docker/issues>

latest: git://github.com/kaazing/gateway.docker@9b1841177bb138799e4c65f21beb915e4653de3a
5.0.1.21: git://github.com/kaazing/gateway.docker@9b1841177bb138799e4c65f21beb915e4653de3a
latest: git://github.com/kaazing/gateway.docker@ab90b204bb56d0f40e38b87189fb95748ac19dfd
5.0.1.38: git://github.com/kaazing/gateway.docker@ab90b204bb56d0f40e38b87189fb95748ac19dfd
6 changes: 3 additions & 3 deletions library/mariadb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
10: git://github.com/docker-library/mariadb@034c283be05caa5e465047ce19f1770647eadd74 10.0
latest: git://github.com/docker-library/mariadb@034c283be05caa5e465047ce19f1770647eadd74 10.0

5.5.46: git://github.com/docker-library/mariadb@fe52f7ab9f0a4f827394ba65f5c7f51def1959c1 5.5
5.5: git://github.com/docker-library/mariadb@fe52f7ab9f0a4f827394ba65f5c7f51def1959c1 5.5
5: git://github.com/docker-library/mariadb@fe52f7ab9f0a4f827394ba65f5c7f51def1959c1 5.5
5.5.47: git://github.com/docker-library/mariadb@de4c20ffb8cb11baa7a522f8e0d98316dc95f2cb 5.5
5.5: git://github.com/docker-library/mariadb@de4c20ffb8cb11baa7a522f8e0d98316dc95f2cb 5.5
5: git://github.com/docker-library/mariadb@de4c20ffb8cb11baa7a522f8e0d98316dc95f2cb 5.5
4 changes: 2 additions & 2 deletions library/nats
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# maintainer: Derek Collison <derek@apcera.com> (@derekcollison)
# maintainer: Waldemar Salinas <wally@apcera.com> (@wallyqs)

0.6.8: git://github.com/nats-io/nats-docker@09e3ad91cb1716629a24a731fc618028d995c9ea
latest: git://github.com/nats-io/nats-docker@09e3ad91cb1716629a24a731fc618028d995c9ea
0.7.2: git://github.com/nats-io/nats-docker@1b4a8d5b0e99f3983a71d54ddb70cecc1e8228a1
latest: git://github.com/nats-io/nats-docker@1b4a8d5b0e99f3983a71d54ddb70cecc1e8228a1
38 changes: 19 additions & 19 deletions library/node
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@ argon-slim: git://github.com/nodejs/docker-node@bb89224e0f2572e4894c50abfa8174ca
4-wheezy: git://github.com/nodejs/docker-node@bb89224e0f2572e4894c50abfa8174ca65d6b28f 4.2/wheezy
argon-wheezy: git://github.com/nodejs/docker-node@bb89224e0f2572e4894c50abfa8174ca65d6b28f 4.2/wheezy

5.1.1: git://github.com/nodejs/docker-node@444da1d3492d12d1e174b2764b7c06105c0e407a 5.1
5.1: git://github.com/nodejs/docker-node@444da1d3492d12d1e174b2764b7c06105c0e407a 5.1
5: git://github.com/nodejs/docker-node@444da1d3492d12d1e174b2764b7c06105c0e407a 5.1
latest: git://github.com/nodejs/docker-node@444da1d3492d12d1e174b2764b7c06105c0e407a 5.1

5.1.1-onbuild: git://github.com/nodejs/docker-node@444da1d3492d12d1e174b2764b7c06105c0e407a 5.1/onbuild
5.1-onbuild: git://github.com/nodejs/docker-node@444da1d3492d12d1e174b2764b7c06105c0e407a 5.1/onbuild
5-onbuild: git://github.com/nodejs/docker-node@444da1d3492d12d1e174b2764b7c06105c0e407a 5.1/onbuild
onbuild: git://github.com/nodejs/docker-node@444da1d3492d12d1e174b2764b7c06105c0e407a 5.1/onbuild

5.1.1-slim: git://github.com/nodejs/docker-node@444da1d3492d12d1e174b2764b7c06105c0e407a 5.1/slim
5.1-slim: git://github.com/nodejs/docker-node@444da1d3492d12d1e174b2764b7c06105c0e407a 5.1/slim
5-slim: git://github.com/nodejs/docker-node@444da1d3492d12d1e174b2764b7c06105c0e407a 5.1/slim
slim: git://github.com/nodejs/docker-node@444da1d3492d12d1e174b2764b7c06105c0e407a 5.1/slim

5.1.1-wheezy: git://github.com/nodejs/docker-node@bb89224e0f2572e4894c50abfa8174ca65d6b28f 5.1/wheezy
5.1-wheezy: git://github.com/nodejs/docker-node@bb89224e0f2572e4894c50abfa8174ca65d6b28f 5.1/wheezy
5-wheezy: git://github.com/nodejs/docker-node@bb89224e0f2572e4894c50abfa8174ca65d6b28f 5.1/wheezy
wheezy: git://github.com/nodejs/docker-node@bb89224e0f2572e4894c50abfa8174ca65d6b28f 5.1/wheezy
5.2.0: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2
5.2: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2
5: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2
latest: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2

5.2.0-onbuild: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2/onbuild
5.2-onbuild: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2/onbuild
5-onbuild: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2/onbuild
onbuild: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2/onbuild

5.2.0-slim: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2/slim
5.2-slim: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2/slim
5-slim: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2/slim
slim: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2/slim

5.2.0-wheezy: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2/wheezy
5.2-wheezy: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2/wheezy
5-wheezy: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2/wheezy
wheezy: git://github.com/nodejs/docker-node@5d433ece4d221fac7e38efbec25ffea2dea56286 5.2/wheezy
12 changes: 6 additions & 6 deletions library/opensuse
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# maintainer: Flavio Castelli <fcastelli@suse.com> (@flavio)

# openSUSE 13.2
13.2: git://github.com/openSUSE/docker-containers-build@d9e75cd826dffd35984b8c7c9322494810b4e29c docker
harlequin: git://github.com/openSUSE/docker-containers-build@d9e75cd826dffd35984b8c7c9322494810b4e29c docker
13.2: git://github.com/openSUSE/docker-containers-build@3bbe87081f5d8f89e56fdca093ea24c3ab8b2992 docker
harlequin: git://github.com/openSUSE/docker-containers-build@3bbe87081f5d8f89e56fdca093ea24c3ab8b2992 docker

# openSUSE 42.1
42.1: git://github.com/openSUSE/docker-containers-build@da3cf11b9e96b61ffbe92de846e77075bc11e326 docker
leap: git://github.com/openSUSE/docker-containers-build@da3cf11b9e96b61ffbe92de846e77075bc11e326 docker
latest: git://github.com/openSUSE/docker-containers-build@da3cf11b9e96b61ffbe92de846e77075bc11e326 docker
42.1: git://github.com/openSUSE/docker-containers-build@70d5db31fd5357d4d36170570d215120800b4f3c docker
leap: git://github.com/openSUSE/docker-containers-build@70d5db31fd5357d4d36170570d215120800b4f3c docker
latest: git://github.com/openSUSE/docker-containers-build@70d5db31fd5357d4d36170570d215120800b4f3c docker

# openSUSE Tumbleweed
tumbleweed: git://github.com/openSUSE/docker-containers-build@be79ebd1a6640e08fae0e79c1511546da2b58bcd docker
tumbleweed: git://github.com/openSUSE/docker-containers-build@9afc04abd28f91bb954057bc32d7b2687adc9f03 docker
24 changes: 12 additions & 12 deletions library/perl
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# maintainer: Peter Martini <PeterCMartini@GMail.com> (@PeterMartini)

latest: git://github.com/perl/docker-perl@r20150917.0 5.022.000-64bit
latest: git://github.com/perl/docker-perl@r20151213.0 5.022.001-64bit

5: git://github.com/perl/docker-perl@r20150917.0 5.022.000-64bit
5: git://github.com/perl/docker-perl@r20151213.0 5.022.001-64bit

5.22: git://github.com/perl/docker-perl@r20150917.0 5.022.000-64bit
5.22.0: git://github.com/perl/docker-perl@r20150917.0 5.022.000-64bit
5.22: git://github.com/perl/docker-perl@r20151213.0 5.022.001-64bit
5.22.1: git://github.com/perl/docker-perl@r20151213.0 5.022.001-64bit

5.20: git://github.com/perl/docker-perl@r20150917.0 5.020.003-64bit
5.20.3: git://github.com/perl/docker-perl@r20150917.0 5.020.003-64bit
5.20: git://github.com/perl/docker-perl@r20151213.0 5.020.003-64bit
5.20.3: git://github.com/perl/docker-perl@r20151213.0 5.020.003-64bit

threaded: git://github.com/perl/docker-perl@r20150917.0 5.022.000-64bit,threaded
threaded: git://github.com/perl/docker-perl@r20151213.0 5.022.001-64bit,threaded

5-threaded: git://github.com/perl/docker-perl@r20150917.0 5.022.000-64bit,threaded
5-threaded: git://github.com/perl/docker-perl@r20151213.0 5.022.001-64bit,threaded

5.22-threaded: git://github.com/perl/docker-perl@r20150917.0 5.022.000-64bit,threaded
5.22.0-threaded: git://github.com/perl/docker-perl@r20150917.0 5.022.000-64bit,threaded
5.22-threaded: git://github.com/perl/docker-perl@r20151213.0 5.022.001-64bit,threaded
5.22.1-threaded: git://github.com/perl/docker-perl@r20151213.0 5.022.001-64bit,threaded

5.20-threaded: git://github.com/perl/docker-perl@r20150917.0 5.020.003-64bit,threaded
5.20.3-threaded: git://github.com/perl/docker-perl@r20150917.0 5.020.003-64bit,threaded
5.20-threaded: git://github.com/perl/docker-perl@r20151213.0 5.020.003-64bit,threaded
5.20.3-threaded: git://github.com/perl/docker-perl@r20151213.0 5.020.003-64bit,threaded
Loading

0 comments on commit c365d82

Please sign in to comment.