Merge branch 'slim' into 2.15.x-slim

openfrontier · May 8, 2018 · f926d6c · f926d6c
2 parents 63f1681 + b381af5
commit f926d6c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -38,6 +38,9 @@ RUN set -ex; \
 	key='B42F6819007F00F88E364FD4036A9C25BF357DD4'; \
 	gpg --yes --always-trust --keyserver pgp.mit.edu --recv-keys "$key" || \
 	gpg --yes --always-trust --keyserver keyserver.pgp.com --recv-keys "$key" || \
+	gpg --yes --always-trust --keyserver keyserver.ubuntu.com --recv-keys "$key" || \
+	gpg --yes --always-trust --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys "$key" || \
+	gpg --yes --always-trust --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
 	gpg --yes --always-trust --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
 	gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
 	rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \

diff --git a/README.md b/README.md
@@ -16,7 +16,8 @@
 
 #### Debian base
 
- * openfrontier/gerrit:slim -> 2.14.8
+ * openfrontier/gerrit:slim -> 2.15.1
+ * openfrontier/gerrit:2.15.x-slim -> 2.15.1
  * openfrontier/gerrit:2.14.x-slim -> 2.14.8
 
 ## Migrate from ReviewDB to NoteDB