From 0337c18b1da44a847e8f6003ace3c462c103e952 Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Thu, 19 Jan 2017 16:22:34 +0100 Subject: [PATCH 1/6] Add the XWiki official image --- library/xwiki | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 library/xwiki diff --git a/library/xwiki b/library/xwiki new file mode 100644 index 0000000000000..3e6ac28e51086 --- /dev/null +++ b/library/xwiki @@ -0,0 +1,6 @@ +Maintainers: Vincent Massol (@vmassol) +GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git + +Tags: latest, 8.x +GitCommit: 6c234442c9c5cd858c44a56f9766917f7e214894 +Directory: xwiki-mysql-tomcat From edcfea548144e6e05aa0293b7a4eacd8ae2a90fd Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Mon, 23 Jan 2017 15:18:31 +0100 Subject: [PATCH 2/6] Improve the XWiki official image by adding more tags and update to the most recent commits --- library/xwiki | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/library/xwiki b/library/xwiki index 3e6ac28e51086..9b68810846f85 100644 --- a/library/xwiki +++ b/library/xwiki @@ -1,6 +1,10 @@ Maintainers: Vincent Massol (@vmassol) GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git -Tags: latest, 8.x -GitCommit: 6c234442c9c5cd858c44a56f9766917f7e214894 +Tags: latest, latest-mysql-tomcat +GitCommit: f12105946de0ec0fe2b319ddd5a1c2c807bf00fb +Directory: xwiki-mysql-tomcat + +Tags: 8, 8-mysql-tomcat +GitCommit: 7ab5cfafc4ffec3fed180ef950f747226a3312ca Directory: xwiki-mysql-tomcat From 6aa0613add940632cdeb839c45b9a35e67f7761b Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Fri, 27 Jan 2017 15:12:26 +0100 Subject: [PATCH 3/6] Update sha1 to match latest commits --- library/xwiki | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/xwiki b/library/xwiki index 9b68810846f85..f0523f0a43f24 100644 --- a/library/xwiki +++ b/library/xwiki @@ -2,9 +2,9 @@ Maintainers: Vincent Massol (@vmassol) GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git Tags: latest, latest-mysql-tomcat -GitCommit: f12105946de0ec0fe2b319ddd5a1c2c807bf00fb +GitCommit: 1f845295f650ce5c755712b801b84ad8198b9d7b Directory: xwiki-mysql-tomcat Tags: 8, 8-mysql-tomcat -GitCommit: 7ab5cfafc4ffec3fed180ef950f747226a3312ca +GitCommit: e8ad90aa6d119301bd4b810a88ed71b2f8a0e224 Directory: xwiki-mysql-tomcat From 2ec14c957eea0515560fc5314223f73957759d1c Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Fri, 27 Jan 2017 19:04:01 +0100 Subject: [PATCH 4/6] Added missing branch info + apply best practices for "latest" tag usage --- library/xwiki | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/xwiki b/library/xwiki index f0523f0a43f24..3834ac78ad833 100644 --- a/library/xwiki +++ b/library/xwiki @@ -1,10 +1,11 @@ Maintainers: Vincent Massol (@vmassol) GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git -Tags: latest, latest-mysql-tomcat +Tags: latest, mysql-tomcat GitCommit: 1f845295f650ce5c755712b801b84ad8198b9d7b Directory: xwiki-mysql-tomcat Tags: 8, 8-mysql-tomcat GitCommit: e8ad90aa6d119301bd4b810a88ed71b2f8a0e224 +GitFetch: refs/heads/8.x Directory: xwiki-mysql-tomcat From 3fe5478477d13718e166b23689737158af7314b8 Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Mon, 30 Jan 2017 11:55:31 +0100 Subject: [PATCH 5/6] Apply best practices and review suggestions from Tianon Gravi --- library/xwiki | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/xwiki b/library/xwiki index 3834ac78ad833..a0bddbbc47f7f 100644 --- a/library/xwiki +++ b/library/xwiki @@ -2,10 +2,10 @@ Maintainers: Vincent Massol (@vmassol) GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git Tags: latest, mysql-tomcat -GitCommit: 1f845295f650ce5c755712b801b84ad8198b9d7b +GitCommit: 52b982b1c18ed06b87b20d33c677a3efb7b361f6 Directory: xwiki-mysql-tomcat Tags: 8, 8-mysql-tomcat -GitCommit: e8ad90aa6d119301bd4b810a88ed71b2f8a0e224 +GitCommit: 56aa09e5859e22b370a950ec08f9c3a04067915e GitFetch: refs/heads/8.x Directory: xwiki-mysql-tomcat From c6aa560d3e9c2a75e76e02bbf68b809222fbb14b Mon Sep 17 00:00:00 2001 From: Vincent Massol Date: Wed, 1 Feb 2017 16:22:44 +0100 Subject: [PATCH 6/6] Update to latest sha1 after including suggestions from yosifkit --- library/xwiki | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/xwiki b/library/xwiki index a0bddbbc47f7f..92ee9a46ff620 100644 --- a/library/xwiki +++ b/library/xwiki @@ -2,10 +2,10 @@ Maintainers: Vincent Massol (@vmassol) GitRepo: https://github.com/xwiki-contrib/docker-xwiki.git Tags: latest, mysql-tomcat -GitCommit: 52b982b1c18ed06b87b20d33c677a3efb7b361f6 +GitCommit: 6c386ede3706ca0bff2a65d6559e15497d8e4a30 Directory: xwiki-mysql-tomcat Tags: 8, 8-mysql-tomcat -GitCommit: 56aa09e5859e22b370a950ec08f9c3a04067915e +GitCommit: 44b586d58e03d569c731519edfb6f6e7175d5c82 GitFetch: refs/heads/8.x Directory: xwiki-mysql-tomcat