You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by rd...@apache.org on 2019/03/08 16:35:41 UTC
[tinkerpop] branch TINKERPOP-2174 created (now 7e58bf8)
This is an automated email from the ASF dual-hosted git repository.
rdale pushed a change to branch TINKERPOP-2174
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
at 7e58bf8 TINKERPOP-2174 docker best practices
This branch includes the following new commits:
new 7e58bf8 TINKERPOP-2174 docker best practices
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[tinkerpop] 01/01: TINKERPOP-2174 docker best practices
Posted by rd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rdale pushed a commit to branch TINKERPOP-2174
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 7e58bf8e294f085fb24a0a31a3b4081b9bbd2233
Author: Robert Dale <ro...@gmail.com>
AuthorDate: Fri Mar 8 11:35:00 2019 -0500
TINKERPOP-2174 docker best practices
---
docker/Dockerfile | 2 +-
docker/hadoop/Dockerfile.template | 2 +-
gremlin-console/Dockerfile | 12 ++++++++----
gremlin-server/Dockerfile | 13 +++++++++----
4 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a908b22..8de8705 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,7 +17,7 @@
FROM ubuntu:trusty
-MAINTAINER Daniel Kuppitz <me...@gremlin.guru>
+LABEL maintainer="Daniel Kuppitz <me...@gremlin.guru>"
RUN apt-get update \
&& apt-get -y install software-properties-common python-software-properties apt-transport-https curl dpkg \
diff --git a/docker/hadoop/Dockerfile.template b/docker/hadoop/Dockerfile.template
index 33277e9..89538d1 100644
--- a/docker/hadoop/Dockerfile.template
+++ b/docker/hadoop/Dockerfile.template
@@ -17,7 +17,7 @@
FROM tinkerpop:base
-MAINTAINER Daniel Kuppitz <me...@gremlin.guru>
+LABEL maintainer="Daniel Kuppitz <me...@gremlin.guru>"
ENV HADOOP_VERSION HADOOP_VERSION
diff --git a/gremlin-console/Dockerfile b/gremlin-console/Dockerfile
index 909952f..ff57227 100644
--- a/gremlin-console/Dockerfile
+++ b/gremlin-console/Dockerfile
@@ -15,17 +15,21 @@
# specific language governing permissions and limitations
# under the License.
-FROM openjdk:8u151-jre-alpine3.7
+FROM openjdk:8-jre-alpine
+
+LABEL maintainer="dev@tinkerpop.apache.org"
ARG GREMLIN_CONSOLE_DIR
-RUN apk add --update \
- bash \
- && rm -rf /var/cache/apk/*
+RUN apk add --no-cache --update bash
COPY src/main/docker/docker-entrypoint.sh /
COPY ${GREMLIN_CONSOLE_DIR} /opt/gremlin-console
WORKDIR /opt/gremlin-console
+RUN addgroup -S gremlin && adduser -S -s /bin/false -G gremlin gremlin
+RUN chown -R gremlin:gremlin /opt/gremlin-console
+USER gremlin
+
ENTRYPOINT ["/docker-entrypoint.sh"]
\ No newline at end of file
diff --git a/gremlin-server/Dockerfile b/gremlin-server/Dockerfile
index c47e0cf..3b1e849 100644
--- a/gremlin-server/Dockerfile
+++ b/gremlin-server/Dockerfile
@@ -15,14 +15,15 @@
# specific language governing permissions and limitations
# under the License.
-FROM openjdk:8u151-jre-alpine3.7
+FROM openjdk:8-jre-alpine
+
+LABEL maintainer="dev@tinkerpop.apache.org"
ARG GREMLIN_SERVER_DIR
-RUN apk add --update \
+RUN apk add --no-cache --update \
bash \
- perl \
- && rm -rf /var/cache/apk/*
+ perl
COPY src/main/docker/docker-entrypoint.sh /
COPY ${GREMLIN_SERVER_DIR} /opt/gremlin-server
@@ -31,5 +32,9 @@ WORKDIR /opt/gremlin-server
EXPOSE 8182
+RUN addgroup -S gremlin && adduser -S -s /bin/false -G gremlin gremlin
+RUN chown -R gremlin:gremlin /opt/gremlin-server
+USER gremlin
+
ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["conf/gremlin-server.yaml"]
\ No newline at end of file