Browse Source

Merge remote-tracking branch 'upstream/master'

Roberto Franchini 9 years ago
parent
commit
3b8acfc046
4 changed files with 26 additions and 24 deletions
  1. 4 4
      library/drupal
  2. 2 2
      library/mariadb
  3. 17 15
      library/neurodebian
  4. 3 3
      library/redis

+ 4 - 4
library/drupal

@@ -20,10 +20,10 @@ Tags: 8.1.8-fpm, 8.1-fpm, 8-fpm, fpm
 GitCommit: ee9b5787b307fba785f5cf15e626ee1d9c6e4d4d
 Directory: 8.1/fpm
 
-Tags: 8.2.0-beta2-apache, 8.2.0-apache, 8.2-apache, 8.2.0-beta2, 8.2.0, 8.2
-GitCommit: b1ef048b7aec464f1e359a62c6bf937e3edb3e8c
+Tags: 8.2.0-beta3-apache, 8.2.0-apache, 8.2-apache, 8.2.0-beta3, 8.2.0, 8.2
+GitCommit: 607242be7d811c380aba061ad8f995f0cc223e37
 Directory: 8.2/apache
 
-Tags: 8.2.0-beta2-fpm, 8.2.0-fpm, 8.2-fpm
-GitCommit: b1ef048b7aec464f1e359a62c6bf937e3edb3e8c
+Tags: 8.2.0-beta3-fpm, 8.2.0-fpm, 8.2-fpm
+GitCommit: 607242be7d811c380aba061ad8f995f0cc223e37
 Directory: 8.2/fpm

+ 2 - 2
library/mariadb

@@ -8,8 +8,8 @@ Tags: 10.1.16, 10.1, 10, latest
 GitCommit: d969a465ee48fe10f4b532276f7337ddaaf3fc36
 Directory: 10.1
 
-Tags: 10.0.26, 10.0
-GitCommit: d969a465ee48fe10f4b532276f7337ddaaf3fc36
+Tags: 10.0.27, 10.0
+GitCommit: 9d7717c9d7e98619a3b7e7d4337e64b0de7d2f5b
 Directory: 10.0
 
 Tags: 5.5.51, 5.5, 5

+ 17 - 15
library/neurodebian

@@ -1,23 +1,25 @@
 # maintainer: Yaroslav Halchenko <[email protected]> (@yarikoptic)
 
-precise: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/precise
-nd12.04: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/precise
+precise: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/precise
+nd12.04: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/precise
 
-trusty: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/trusty
-nd14.04: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/trusty
+trusty: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/trusty
+nd14.04: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/trusty
 
-wily: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/wily
-nd15.10: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/wily
+xenial: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/xenial
+nd16.04: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/xenial
 
-wheezy: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/wheezy
-nd70: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/wheezy
+yakkety: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/yakkety
+nd16.10: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/yakkety
 
-jessie: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/jessie
-nd80: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/jessie
-latest: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/jessie
+wheezy: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/wheezy
+nd70: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/wheezy
 
-stretch: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/stretch
-nd90: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/stretch
+jessie: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/jessie
+nd80: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/jessie
 
-sid: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/sid
-nd: git://github.com/neurodebian/dockerfiles@dc947232d6c7bf67d1dba642fdb1234fbaa95ab7 dockerfiles/sid
+stretch: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/stretch
+nd90: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/stretch
+
+sid: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/sid
+nd: git://github.com/neurodebian/dockerfiles@336c4d3566c3c8311960c001e6032dab6d59c3b3 dockerfiles/sid

+ 3 - 3
library/redis

@@ -17,13 +17,13 @@ GitCommit: c49a42f6efcd2b971e43e93116a976b058035544
 Directory: 3.0/alpine
 
 Tags: 3.2.3, 3.2, 3, latest
-GitCommit: ab537600e90916e0425c938054db1bf50256853c
+GitCommit: 71807ba24f85da5bc14e9251da3617bbb6f47146
 Directory: 3.2
 
 Tags: 3.2.3-32bit, 3.2-32bit, 3-32bit, 32bit
-GitCommit: ab537600e90916e0425c938054db1bf50256853c
+GitCommit: 71807ba24f85da5bc14e9251da3617bbb6f47146
 Directory: 3.2/32bit
 
 Tags: 3.2.3-alpine, 3.2-alpine, 3-alpine, alpine
-GitCommit: ab537600e90916e0425c938054db1bf50256853c
+GitCommit: 71807ba24f85da5bc14e9251da3617bbb6f47146
 Directory: 3.2/alpine