Skip to content

Commit

Permalink
Merge branch 'master' into swift
Browse files Browse the repository at this point in the history
  • Loading branch information
swizzlr committed Jan 20, 2017
2 parents 8d47306 + e613c4d commit c03f413
Show file tree
Hide file tree
Showing 67 changed files with 625 additions and 481 deletions.
4 changes: 2 additions & 2 deletions library/aerospike
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# maintainer: Lucien Volmar <lucien@aerospike.com> (@volmarl)

3.10.1.1: git://github.com/aerospike/aerospike-server.docker@c54477af5e0b62f506d5234dca012db63c906224
latest: git://github.com/aerospike/aerospike-server.docker@c54477af5e0b62f506d5234dca012db63c906224
3.11.0.2: git://github.com/aerospike/aerospike-server.docker@02bb550eaa05935b5ddc30df943f5245d91819d8
latest: git://github.com/aerospike/aerospike-server.docker@02bb550eaa05935b5ddc30df943f5245d91819d8
2 changes: 1 addition & 1 deletion library/alpine
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
3.2: git://github.com/gliderlabs/docker-alpine@39157ab3587065a0e0928663dea293ae43110cd9 versions/library-3.2
3.3: git://github.com/gliderlabs/docker-alpine@62168e0f780d64f2124a7be94ed31991a31ae5ad versions/library-3.3
3.4: git://github.com/gliderlabs/docker-alpine@71c9ce882016759bcc0d47f372d20a1b6ec93cd5 versions/library-3.4
latest: git://github.com/gliderlabs/docker-alpine@71c9ce882016759bcc0d47f372d20a1b6ec93cd5 versions/library-3.4
3.5: git://github.com/gliderlabs/docker-alpine@c584d0198d5dea1c5d942e1e1a7b2504ecdb4d30 versions/library-3.5
latest: git://github.com/gliderlabs/docker-alpine@c584d0198d5dea1c5d942e1e1a7b2504ecdb4d30 versions/library-3.5
edge: git://github.com/gliderlabs/docker-alpine@b14ddc0a4f7aed069027aa7943609a4e8e3001fc versions/library-edge

6 changes: 3 additions & 3 deletions library/arangodb
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
2.8.11: git://github.com/arangodb/arangodb-docker@05366cb4c6a6aab8e1ff9ca74c81b09d9a57b5b5 jessie/2.8.11


3.1: git://github.com/arangodb/arangodb-docker@c2776c0587ceea1af3458b6c344f2229d59cc309 jessie/3.1.7
3.1.7: git://github.com/arangodb/arangodb-docker@c2776c0587ceea1af3458b6c344f2229d59cc309 jessie/3.1.7
latest: git://github.com/arangodb/arangodb-docker@c2776c0587ceea1af3458b6c344f2229d59cc309 jessie/3.1.7
3.1: git://github.com/arangodb/arangodb-docker@4f5bb422c58f7d7e8f3477470fbabe8253c3fdae jessie/3.1.8
3.1.8: git://github.com/arangodb/arangodb-docker@4f5bb422c58f7d7e8f3477470fbabe8253c3fdae jessie/3.1.8
latest: git://github.com/arangodb/arangodb-docker@4f5bb422c58f7d7e8f3477470fbabe8253c3fdae jessie/3.1.8
18 changes: 9 additions & 9 deletions library/bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,34 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon)
GitRepo: https://github.com/tianon/docker-bash.git

Tags: 4.4.5, 4.4, 4, latest
GitCommit: d3283a47fbb92419b7b6fc1fccd30b95d75e9ab6
Tags: 4.4.7, 4.4, 4, latest
GitCommit: cb4f2c9fe2bcda141fb24aa402149399c58b2941
Directory: 4.4

Tags: 4.3.48, 4.3
GitCommit: 2f7c9c45567b18b74c321f0ff1e460ae1117a9b5
GitCommit: f9be0e9789a3852ff28b16e3f739df1bb2130377
Directory: 4.3

Tags: 4.2.53, 4.2
GitCommit: 4813d8692c050fab37ce67f205977b11c4eea42c
GitCommit: f9be0e9789a3852ff28b16e3f739df1bb2130377
Directory: 4.2

Tags: 4.1.17, 4.1
GitCommit: 4813d8692c050fab37ce67f205977b11c4eea42c
GitCommit: f9be0e9789a3852ff28b16e3f739df1bb2130377
Directory: 4.1

Tags: 4.0.44, 4.0
GitCommit: 4813d8692c050fab37ce67f205977b11c4eea42c
GitCommit: f9be0e9789a3852ff28b16e3f739df1bb2130377
Directory: 4.0

Tags: 3.2.57, 3.2, 3
GitCommit: 4813d8692c050fab37ce67f205977b11c4eea42c
GitCommit: f9be0e9789a3852ff28b16e3f739df1bb2130377
Directory: 3.2

Tags: 3.1.23, 3.1
GitCommit: 4813d8692c050fab37ce67f205977b11c4eea42c
GitCommit: f9be0e9789a3852ff28b16e3f739df1bb2130377
Directory: 3.1

Tags: 3.0.22, 3.0
GitCommit: 0fb93762d52d5f73ea53557706f19a255ef990d1
GitCommit: f9be0e9789a3852ff28b16e3f739df1bb2130377
Directory: 3.0
12 changes: 6 additions & 6 deletions library/busybox
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon),
GitRepo: https://github.com/docker-library/busybox.git
GitFetch: refs/heads/dist

Tags: 1.26.0-glibc, 1.26-glibc, 1-glibc, glibc
GitCommit: 5abf0d09083c916fa5d3dc109d9d0681f9640703
Tags: 1.26.2-glibc, 1.26-glibc, 1-glibc, glibc
GitCommit: dc7ac200409e8c5dc5c09ef26bfa82dbfec4605b
Directory: glibc

Tags: 1.26.0-musl, 1.26-musl, 1-musl, musl
GitCommit: 5abf0d09083c916fa5d3dc109d9d0681f9640703
Tags: 1.26.2-musl, 1.26-musl, 1-musl, musl
GitCommit: dc7ac200409e8c5dc5c09ef26bfa82dbfec4605b
Directory: musl

Tags: 1.26.0-uclibc, 1.26-uclibc, 1-uclibc, uclibc, 1.26.0, 1.26, 1, latest
GitCommit: 5abf0d09083c916fa5d3dc109d9d0681f9640703
Tags: 1.26.2-uclibc, 1.26-uclibc, 1-uclibc, uclibc, 1.26.2, 1.26, 1, latest
GitCommit: dc7ac200409e8c5dc5c09ef26bfa82dbfec4605b
Directory: uclibc
8 changes: 4 additions & 4 deletions library/cassandra
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon),
GitRepo: https://github.com/docker-library/cassandra.git

Tags: 2.1.16, 2.1
GitCommit: 4bb926527d4a9eb534508fe0bbae604dee81f40a
GitCommit: 3ca0a18a575ae318f753ab1ecf01d54c93192681
Directory: 2.1

Tags: 2.2.8, 2.2, 2
GitCommit: 4bb926527d4a9eb534508fe0bbae604dee81f40a
GitCommit: 3ca0a18a575ae318f753ab1ecf01d54c93192681
Directory: 2.2

Tags: 3.0.10, 3.0
GitCommit: d3a91560b21e73994235a72a4c3153e775e1654d
GitCommit: 3ca0a18a575ae318f753ab1ecf01d54c93192681
Directory: 3.0

Tags: 3.9, 3, latest
GitCommit: 4bb926527d4a9eb534508fe0bbae604dee81f40a
GitCommit: 3ca0a18a575ae318f753ab1ecf01d54c93192681
Directory: 3.9
4 changes: 2 additions & 2 deletions library/composer
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
Maintainers: Composer (@composer), Rob Bast (@alcohol)
GitRepo: https://github.com/composer/docker.git

Tags: 1.3.0, 1.3, 1, latest
GitCommit: 42d33131b49f1696205f3b708c6d1513b20823ce
Tags: 1.3.1, 1.3, 1, latest
GitCommit: eb996e63c904992ebe1092e8732afa553a29932a
Directory: 1.3

Tags: 1.2.4, 1.2
Expand Down
6 changes: 3 additions & 3 deletions library/crate
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

# see also https://crate.io

latest: git://github.com/crate/docker-crate@51d0d07e455bb6658341cbd7bf8a670c94fdd92c
latest: git://github.com/crate/docker-crate@add38c215dbcbfa1645382a0ecea6923d9002828
0.57: git://github.com/crate/docker-crate@54ceb9d7065ee853faf3b050ddaeeee3580585b8
0.57.6: git://github.com/crate/docker-crate@54ceb9d7065ee853faf3b050ddaeeee3580585b8
1.0: git://github.com/crate/docker-crate@51d0d07e455bb6658341cbd7bf8a670c94fdd92c
1.0.1: git://github.com/crate/docker-crate@51d0d07e455bb6658341cbd7bf8a670c94fdd92c
1.0: git://github.com/crate/docker-crate@add38c215dbcbfa1645382a0ecea6923d9002828
1.0.2: git://github.com/crate/docker-crate@add38c215dbcbfa1645382a0ecea6923d9002828
48 changes: 24 additions & 24 deletions library/debian
Original file line number Diff line number Diff line change
Expand Up @@ -3,112 +3,112 @@ Maintainers: Tianon Gravi <tianon@debian.org> (@tianon),
GitRepo: https://github.com/tianon/docker-brew-debian.git

# commits: (master..dist-stable)
# - d220bea 2016-12-13 debootstraps
# - b39d316 2017-01-16 debootstraps

# commits: (master..dist-unstable)
# - 9907966 2016-12-13 debootstraps
# - 23f6f0c 2017-01-16 debootstraps

# commits: (master..dist-oldstable)
# - a7561be 2016-12-13 debootstraps
# - 084e719 2017-01-16 debootstraps

Tags: 8.6, 8, jessie, latest
Tags: 8.7, 8, jessie, latest
GitFetch: refs/heads/dist-stable
GitCommit: d220bea42308935d3bee1b40701f39e8c0d69860
GitCommit: b39d31635ca26c8b1f3d982090ba8d54167c4d85
Directory: jessie

Tags: jessie-slim
GitFetch: refs/heads/dist-stable
GitCommit: d220bea42308935d3bee1b40701f39e8c0d69860
GitCommit: b39d31635ca26c8b1f3d982090ba8d54167c4d85
Directory: jessie/slim

Tags: jessie-backports
GitFetch: refs/heads/dist-stable
GitCommit: d220bea42308935d3bee1b40701f39e8c0d69860
GitCommit: b39d31635ca26c8b1f3d982090ba8d54167c4d85
Directory: jessie/backports

Tags: oldstable
GitFetch: refs/heads/dist-oldstable
GitCommit: a7561bee7a4bbc2e5f7ea6b8a7377d8abe6eb2a6
GitCommit: 084e7195a95c633d1ce4826309ac29b3ece23a20
Directory: oldstable

Tags: oldstable-slim
GitFetch: refs/heads/dist-oldstable
GitCommit: a7561bee7a4bbc2e5f7ea6b8a7377d8abe6eb2a6
GitCommit: 084e7195a95c633d1ce4826309ac29b3ece23a20
Directory: oldstable/slim

Tags: oldstable-backports
GitFetch: refs/heads/dist-oldstable
GitCommit: a7561bee7a4bbc2e5f7ea6b8a7377d8abe6eb2a6
GitCommit: 084e7195a95c633d1ce4826309ac29b3ece23a20
Directory: oldstable/backports

Tags: sid
GitFetch: refs/heads/dist-unstable
GitCommit: 99079665857cbbdf221f8d3e44d5081dd13e4ff7
GitCommit: 23f6f0c85fc2d2ebe6e1a56ef6243779d0ce89a2
Directory: sid

Tags: sid-slim
GitFetch: refs/heads/dist-unstable
GitCommit: 99079665857cbbdf221f8d3e44d5081dd13e4ff7
GitCommit: 23f6f0c85fc2d2ebe6e1a56ef6243779d0ce89a2
Directory: sid/slim

Tags: stable
GitFetch: refs/heads/dist-stable
GitCommit: d220bea42308935d3bee1b40701f39e8c0d69860
GitCommit: b39d31635ca26c8b1f3d982090ba8d54167c4d85
Directory: stable

Tags: stable-slim
GitFetch: refs/heads/dist-stable
GitCommit: d220bea42308935d3bee1b40701f39e8c0d69860
GitCommit: b39d31635ca26c8b1f3d982090ba8d54167c4d85
Directory: stable/slim

Tags: stable-backports
GitFetch: refs/heads/dist-stable
GitCommit: d220bea42308935d3bee1b40701f39e8c0d69860
GitCommit: b39d31635ca26c8b1f3d982090ba8d54167c4d85
Directory: stable/backports

Tags: stretch
GitFetch: refs/heads/dist-unstable
GitCommit: 99079665857cbbdf221f8d3e44d5081dd13e4ff7
GitCommit: 23f6f0c85fc2d2ebe6e1a56ef6243779d0ce89a2
Directory: stretch

Tags: stretch-slim
GitFetch: refs/heads/dist-unstable
GitCommit: 99079665857cbbdf221f8d3e44d5081dd13e4ff7
GitCommit: 23f6f0c85fc2d2ebe6e1a56ef6243779d0ce89a2
Directory: stretch/slim

Tags: testing
GitFetch: refs/heads/dist-unstable
GitCommit: 99079665857cbbdf221f8d3e44d5081dd13e4ff7
GitCommit: 23f6f0c85fc2d2ebe6e1a56ef6243779d0ce89a2
Directory: testing

Tags: testing-slim
GitFetch: refs/heads/dist-unstable
GitCommit: 99079665857cbbdf221f8d3e44d5081dd13e4ff7
GitCommit: 23f6f0c85fc2d2ebe6e1a56ef6243779d0ce89a2
Directory: testing/slim

Tags: unstable
GitFetch: refs/heads/dist-unstable
GitCommit: 99079665857cbbdf221f8d3e44d5081dd13e4ff7
GitCommit: 23f6f0c85fc2d2ebe6e1a56ef6243779d0ce89a2
Directory: unstable

Tags: unstable-slim
GitFetch: refs/heads/dist-unstable
GitCommit: 99079665857cbbdf221f8d3e44d5081dd13e4ff7
GitCommit: 23f6f0c85fc2d2ebe6e1a56ef6243779d0ce89a2
Directory: unstable/slim

Tags: 7.11, 7, wheezy
GitFetch: refs/heads/dist-oldstable
GitCommit: a7561bee7a4bbc2e5f7ea6b8a7377d8abe6eb2a6
GitCommit: 084e7195a95c633d1ce4826309ac29b3ece23a20
Directory: wheezy

Tags: wheezy-slim
GitFetch: refs/heads/dist-oldstable
GitCommit: a7561bee7a4bbc2e5f7ea6b8a7377d8abe6eb2a6
GitCommit: 084e7195a95c633d1ce4826309ac29b3ece23a20
Directory: wheezy/slim

Tags: wheezy-backports
GitFetch: refs/heads/dist-oldstable
GitCommit: a7561bee7a4bbc2e5f7ea6b8a7377d8abe6eb2a6
GitCommit: 084e7195a95c633d1ce4826309ac29b3ece23a20
Directory: wheezy/backports

# sid + rc-buggy
Expand Down
48 changes: 18 additions & 30 deletions library/docker
Original file line number Diff line number Diff line change
@@ -1,53 +1,41 @@
# this file is generated via https://github.com/docker-library/docker/blob/a7fc73eef011c47cc2518149bc77a4b9bc7f9f41/generate-stackbrew-library.sh
# this file is generated via https://github.com/docker-library/docker/blob/b202ec7e529f5426e2ad7e8c0a8b82cacd406573/generate-stackbrew-library.sh

Maintainers: Tianon Gravi <tianon@dockerproject.org> (@tianon),
Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/docker.git

Tags: 1.13.0-rc4, 1.13-rc, rc
GitCommit: 5ab6e7f0188981d0c3db235265d4e1b74940a4f8
Directory: 1.13-rc
Tags: 1.13.0, 1.13, 1, latest
GitCommit: b202ec7e529f5426e2ad7e8c0a8b82cacd406573
Directory: 1.13

Tags: 1.13.0-rc4-dind, 1.13-rc-dind, rc-dind
GitCommit: c1af76ec4c97ff24dcf6675b55b12105216dc711
Directory: 1.13-rc/dind
Tags: 1.13.0-dind, 1.13-dind, 1-dind, dind
GitCommit: b202ec7e529f5426e2ad7e8c0a8b82cacd406573
Directory: 1.13/dind

Tags: 1.13.0-rc4-git, 1.13-rc-git, rc-git
GitCommit: 737f83092a47b012d09a0cbf0ed72759550301cb
Directory: 1.13-rc/git
Tags: 1.13.0-git, 1.13-git, 1-git, git
GitCommit: b202ec7e529f5426e2ad7e8c0a8b82cacd406573
Directory: 1.13/git

Tags: 1.12.5, 1.12, 1, latest
GitCommit: 04d634220102faa132092232b46958102d07bcd9
Tags: 1.12.6, 1.12
GitCommit: 05678f7f3198d0787d78de9bdc084dcffccf7276
Directory: 1.12

Tags: 1.12.5-dind, 1.12-dind, 1-dind, dind
Tags: 1.12.6-dind, 1.12-dind
GitCommit: c1af76ec4c97ff24dcf6675b55b12105216dc711
Directory: 1.12/dind

Tags: 1.12.5-git, 1.12-git, 1-git, git
Tags: 1.12.6-git, 1.12-git
GitCommit: 746d9052066ccfbcb98df7d9ae71cf05d8877419
Directory: 1.12/git

Tags: 1.12.5-experimental, 1.12-experimental, 1-experimental, experimental
GitCommit: 04d634220102faa132092232b46958102d07bcd9
Tags: 1.12.6-experimental, 1.12-experimental
GitCommit: 05678f7f3198d0787d78de9bdc084dcffccf7276
Directory: 1.12/experimental

Tags: 1.12.5-experimental-dind, 1.12-experimental-dind, 1-experimental-dind, experimental-dind
Tags: 1.12.6-experimental-dind, 1.12-experimental-dind
GitCommit: c1af76ec4c97ff24dcf6675b55b12105216dc711
Directory: 1.12/experimental/dind

Tags: 1.12.5-experimental-git, 1.12-experimental-git, 1-experimental-git, experimental-git
Tags: 1.12.6-experimental-git, 1.12-experimental-git
GitCommit: eb714a73e7e3f87705f468c3c6e9f4e316136bf5
Directory: 1.12/experimental/git

Tags: 1.11.2, 1.11
GitCommit: 0c44c1c6c25a34eb9abe320805e0f89bf5b0ace2
Directory: 1.11

Tags: 1.11.2-dind, 1.11-dind
GitCommit: 5e30187978ad75d0f2ae5fc6c2a0b668bdf16885
Directory: 1.11/dind

Tags: 1.11.2-git, 1.11-git
GitCommit: 866c3fbd87e8eeed524fdf19ba2d63288ad49cd2
Directory: 1.11/git
8 changes: 4 additions & 4 deletions library/drupal
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon),
Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/drupal.git

Tags: 8.2.4-apache, 8.2-apache, 8-apache, apache, 8.2.4, 8.2, 8, latest
GitCommit: aa623002a920a130a638b4b30d664aa59a662d2d
Tags: 8.2.5-apache, 8.2-apache, 8-apache, apache, 8.2.5, 8.2, 8, latest
GitCommit: a2832ca75e94580be81aafffdfc330c1713b519d
Directory: 8.2/apache

Tags: 8.2.4-fpm, 8.2-fpm, 8-fpm, fpm
GitCommit: aa623002a920a130a638b4b30d664aa59a662d2d
Tags: 8.2.5-fpm, 8.2-fpm, 8-fpm, fpm
GitCommit: a2832ca75e94580be81aafffdfc330c1713b519d
Directory: 8.2/fpm

Tags: 7.53-apache, 7-apache, 7.53, 7
Expand Down
10 changes: 7 additions & 3 deletions library/eclipse-mosquitto
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
Maintainers: David Audet <david.audet@ca.com> (@daudetCA)
GitRepo: https://github.com/eclipse/mosquitto.git

Tags: 1.4.8, latest
GitCommit: 5487395fb67ad2e2b6dac1ff67bd0ac289383f09
Tags: 1.4.10, latest
GitCommit: 53616be0e296f6186f52c791e241c76d53380078
Directory: docker/1.4.10

Tags: 1.4.8
GitCommit: 25a1f7d1994fd4b8d1d25ab0275f7a8f071abfb1
Directory: docker/1.4.8

Tags: 1.4.4
GitCommit: 5487395fb67ad2e2b6dac1ff67bd0ac289383f09
GitCommit: 25a1f7d1994fd4b8d1d25ab0275f7a8f071abfb1
Directory: docker/1.4.4
4 changes: 2 additions & 2 deletions library/eggdrop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ Maintainers: Geo Van O <geo@eggheads.org> (@vanosg)
GitRepo: https://github.com/eggheads/eggdrop-docker.git

Tags: develop
GitCommit: 960593552e7ab4506a58237ac72f473a5b8d3bc2
GitCommit: 053389febc4af3db53baa5fc540957ee9c5a3238
Directory: develop

Tags: 1.8, 1.8.0, stable, latest
GitCommit: 98f9d9a8c56b7b88b249135ab6b87019efa82337
GitCommit: e6777989cfd6c7e1b8a5d36265d14a91e03fc932
Directory: 1.8

Tags: 1.6, 1.6.21
Expand Down
Loading

0 comments on commit c03f413

Please sign in to comment.