Merge branch '2.14.x' into 2.14.x-slim

openfrontier · Mar 19, 2019 · 1f22177 · 1f22177
2 parents 208c546 + a542f18
commit 1f22177
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ MAINTAINER zsx <thinkernel@gmail.com>
 ENV GERRIT_HOME /var/gerrit
 ENV GERRIT_SITE ${GERRIT_HOME}/review_site
 ENV GERRIT_WAR ${GERRIT_HOME}/gerrit.war
-ENV GERRIT_VERSION 2.14.18
+ENV GERRIT_VERSION 2.14.19
 ENV GERRIT_USER gerrit2
 ENV GERRIT_INIT_ARGS ""
 

diff --git a/README.md b/README.md
@@ -7,18 +7,18 @@
 
 #### Alpine base
 
- * openfrontier/gerrit:latest -> 2.16.2
- * openfrontier/gerrit:2.15.x -> 2.15.8
- * openfrontier/gerrit:2.14.x -> 2.14.18
+ * openfrontier/gerrit:latest -> 2.16.7
+ * openfrontier/gerrit:2.15.x -> 2.15.12
+ * openfrontier/gerrit:2.14.x -> 2.14.19
  * openfrontier/gerrit:2.13.x -> 2.13.11
  * openfrontier/gerrit:2.12.x -> 2.12.7
  * openfrontier/gerrit:2.11.x -> 2.11.10
  * openfrontier/gerrit:2.10.x -> 2.10.6
 
 #### Debian base
 
- * openfrontier/gerrit:2.15.x-slim -> 2.15.8
- * openfrontier/gerrit:2.14.x-slim -> 2.14.18
+ * openfrontier/gerrit:2.15.x-slim -> 2.15.12
+ * openfrontier/gerrit:2.14.x-slim -> 2.14.19
 
 ## Migrate from ReviewDB to NoteDB
   Since Gerrit 2.16, [NoteDB](https://gerrit-review.googlesource.com/Documentation/note-db.html) is required to store accounts and groups data.
@@ -70,15 +70,16 @@
 
     docker run -d --volumes-from gerrit_volume -p 8080:8080 -p 29418:29418 openfrontier/gerrit
 
-## Use local directory as the gerrit site storage.
+## Use a docker named volume as the gerrit site storage.
+  **DO NOT** use host volumes in particular directories under the home directory like `~/gerrit` as a gerrit volume!!! Use [named volume](https://success.docker.com/article/different-types-of-volumes) instead!!!
 
-  1. Create a site directory for the gerrit site.
+  1. Create a docker volume for the gerrit site.
 
-    mkdir ~/gerrit_volume
+    docker volume create gerrit_volume
 
   2. Initialize and start gerrit using the local directory created above.
 
-    docker run -d -v ~/gerrit_volume:/var/gerrit/review_site -p 8080:8080 -p 29418:29418 openfrontier/gerrit
+    docker run -d -v gerrit_volume:/var/gerrit/review_site -p 8080:8080 -p 29418:29418 openfrontier/gerrit
 
 ## Install plugins on start up.