Prepare docker image for 0.2.3

Signed-off-by: Jan Jansen <jan.jansen@gdata.de>
JanusGraph · Jun 7, 2019 · 5d0e9b0 · 5d0e9b0
1 parent 607fc1e
commit 5d0e9b0
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 54 deletions.
diff --git a/0.2/Dockerfile b/0.2/Dockerfile
@@ -7,7 +7,7 @@ FROM openjdk:8-jdk
 
 ARG CREATED
 ARG REVISION
-ARG JANUS_VERSION=0.2.2
+ARG JANUS_VERSION=0.2.3
 
 ENV JANUS_VERSION=${JANUS_VERSION} \
     JANUS_HOME=/opt/janusgraph \
@@ -26,28 +26,14 @@ RUN groupadd -r janusgraph --gid=999 && \
     useradd -r -g janusgraph --uid=999 janusgraph && \
     curl -fSL https://github.com/JanusGraph/janusgraph/releases/download/v${JANUS_VERSION}/janusgraph-${JANUS_VERSION}-hadoop2.zip -o janusgraph.zip && \
     curl -fSL https://github.com/JanusGraph/janusgraph/releases/download/v${JANUS_VERSION}/janusgraph-${JANUS_VERSION}-hadoop2.zip.asc -o janusgraph.zip.asc && \
-    export GNUPGHOME="$(mktemp -d)" && \
-    for gpgkey in \
-        41802BA8 \
-        D3C95553EE39B05E350D959CA39CC3ADAEAEF36E \
-    ; do \
-        found=''; \
-        for server in \
-            ha.pool.sks-keyservers.net \
-            hkp://keyserver.ubuntu.com:80 \
-            hkp://p80.pool.sks-keyservers.net:80 \
-            pgp.mit.edu \
-        ; do \
-            echo "Fetching GPG key $gpgkey from $server"; \
-            gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$gpgkey" && found=yes && break; \
-        done; \
-        test -z "$found" && echo >&2 "error: failed to fetch GPG key $gpgkey" && exit 1; \
-    done; \
+    curl -fSL https://github.com/JanusGraph/janusgraph/releases/download/v${JANUS_VERSION}/KEYS -o KEYS && \
+    gpg --import KEYS && \
     gpg --batch --verify janusgraph.zip.asc janusgraph.zip && \
     unzip janusgraph.zip && \
     mv janusgraph-${JANUS_VERSION}-hadoop2 /opt/janusgraph && \
     rm janusgraph.zip && \
     rm janusgraph.zip.asc && \
+    rm KEYS && \
     rm -rf ${JANUS_HOME}/elasticsearch && \
     rm -rf ${JANUS_HOME}/javadocs && \
     rm -rf ${JANUS_HOME}/log && \

diff --git a/0.3/Dockerfile b/0.3/Dockerfile
@@ -26,28 +26,14 @@ RUN groupadd -r janusgraph --gid=999 && \
     useradd -r -g janusgraph --uid=999 janusgraph && \
     curl -fSL https://github.com/JanusGraph/janusgraph/releases/download/v${JANUS_VERSION}/janusgraph-${JANUS_VERSION}-hadoop2.zip -o janusgraph.zip && \
     curl -fSL https://github.com/JanusGraph/janusgraph/releases/download/v${JANUS_VERSION}/janusgraph-${JANUS_VERSION}-hadoop2.zip.asc -o janusgraph.zip.asc && \
-    export GNUPGHOME="$(mktemp -d)" && \
-    for gpgkey in \
-        41802BA8 \
-        D3C95553EE39B05E350D959CA39CC3ADAEAEF36E \
-    ; do \
-        found=''; \
-        for server in \
-            ha.pool.sks-keyservers.net \
-            hkp://keyserver.ubuntu.com:80 \
-            hkp://p80.pool.sks-keyservers.net:80 \
-            pgp.mit.edu \
-        ; do \
-            echo "Fetching GPG key $gpgkey from $server"; \
-            gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$gpgkey" && found=yes && break; \
-        done; \
-        test -z "$found" && echo >&2 "error: failed to fetch GPG key $gpgkey" && exit 1; \
-    done; \
+    curl -fSL https://github.com/JanusGraph/janusgraph/releases/download/v${JANUS_VERSION}/KEYS -o KEYS && \
+    gpg --import KEYS && \
     gpg --batch --verify janusgraph.zip.asc janusgraph.zip && \
     unzip janusgraph.zip && \
     mv janusgraph-${JANUS_VERSION}-hadoop2 /opt/janusgraph && \
     rm janusgraph.zip && \
     rm janusgraph.zip.asc && \
+    rm KEYS && \
     rm -rf ${JANUS_HOME}/elasticsearch && \
     rm -rf ${JANUS_HOME}/javadocs && \
     rm -rf ${JANUS_HOME}/log && \

diff --git a/BUILDING.md b/BUILDING.md
@@ -12,7 +12,7 @@ folder directories.
 Optionally build a specific version
 
 ```bash
-./build-image.sh 0.3
+./build-images.sh 0.3
 ```
 
 ## Deployment

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ The default configuration uses the [Oracle Berkeley DB Java Edition][JG_BDB] sto
 and the [Apache Lucene][JG_LUCENE] indexing backend
 
 ```bash
-docker run --name janusgraph-default janusgraph/janusgraph:latest
+docker run --rm --name janusgraph-default janusgraph/janusgraph:latest
 ```
 
 ### Connecting with Gremlin Console

diff --git a/build/Dockerfile-openjdk8.template b/build/Dockerfile-openjdk8.template
@@ -21,28 +21,14 @@ RUN groupadd -r janusgraph --gid=999 && \
     useradd -r -g janusgraph --uid=999 janusgraph && \
     curl -fSL https://github.com/JanusGraph/janusgraph/releases/download/v${JANUS_VERSION}/janusgraph-${JANUS_VERSION}-hadoop2.zip -o janusgraph.zip && \
     curl -fSL https://github.com/JanusGraph/janusgraph/releases/download/v${JANUS_VERSION}/janusgraph-${JANUS_VERSION}-hadoop2.zip.asc -o janusgraph.zip.asc && \
-    export GNUPGHOME="$(mktemp -d)" && \
-    for gpgkey in \
-        41802BA8 \
-        D3C95553EE39B05E350D959CA39CC3ADAEAEF36E \
-    ; do \
-        found=''; \
-        for server in \
-            ha.pool.sks-keyservers.net \
-            hkp://keyserver.ubuntu.com:80 \
-            hkp://p80.pool.sks-keyservers.net:80 \
-            pgp.mit.edu \
-        ; do \
-            echo "Fetching GPG key $gpgkey from $server"; \
-            gpg --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$gpgkey" && found=yes && break; \
-        done; \
-        test -z "$found" && echo >&2 "error: failed to fetch GPG key $gpgkey" && exit 1; \
-    done; \
+    curl -fSL https://github.com/JanusGraph/janusgraph/releases/download/v${JANUS_VERSION}/KEYS -o KEYS && \
+    gpg --import KEYS && \
     gpg --batch --verify janusgraph.zip.asc janusgraph.zip && \
     unzip janusgraph.zip && \
     mv janusgraph-${JANUS_VERSION}-hadoop2 /opt/janusgraph && \
     rm janusgraph.zip && \
     rm janusgraph.zip.asc && \
+    rm KEYS && \
     rm -rf ${JANUS_HOME}/elasticsearch && \
     rm -rf ${JANUS_HOME}/javadocs && \
     rm -rf ${JANUS_HOME}/log && \