diff --git a/2.2-spatial/x86_64/alpine/Dockerfile b/2.2-spatial/alpine/Dockerfile similarity index 100% rename from 2.2-spatial/x86_64/alpine/Dockerfile rename to 2.2-spatial/alpine/Dockerfile diff --git a/2.2-spatial/x86_64/openjdk-slim/Dockerfile b/2.2-spatial/openjdk-slim/Dockerfile similarity index 100% rename from 2.2-spatial/x86_64/openjdk-slim/Dockerfile rename to 2.2-spatial/openjdk-slim/Dockerfile diff --git a/2.2/x86_64/alpine-ibm/Dockerfile b/2.2/alpine-ibm/Dockerfile similarity index 100% rename from 2.2/x86_64/alpine-ibm/Dockerfile rename to 2.2/alpine-ibm/Dockerfile diff --git a/2.2/x86_64/alpine/Dockerfile b/2.2/alpine/Dockerfile similarity index 100% rename from 2.2/x86_64/alpine/Dockerfile rename to 2.2/alpine/Dockerfile diff --git a/2.2/x86_64/openjdk-slim/Dockerfile b/2.2/openjdk-slim/Dockerfile similarity index 100% rename from 2.2/x86_64/openjdk-slim/Dockerfile rename to 2.2/openjdk-slim/Dockerfile diff --git a/2.2/x86_64/rhel/Dockerfile b/2.2/rhel/Dockerfile similarity index 100% rename from 2.2/x86_64/rhel/Dockerfile rename to 2.2/rhel/Dockerfile diff --git a/2.2/x86_64/rhel/help.1 b/2.2/rhel/help.1 similarity index 100% rename from 2.2/x86_64/rhel/help.1 rename to 2.2/rhel/help.1 diff --git a/2.2/x86_64/rhel/help.1.md b/2.2/rhel/help.1.md similarity index 100% rename from 2.2/x86_64/rhel/help.1.md rename to 2.2/rhel/help.1.md diff --git a/2.2/ppc64le/ubuntu/Dockerfile b/2.2/ubuntu/Dockerfile similarity index 100% rename from 2.2/ppc64le/ubuntu/Dockerfile rename to 2.2/ubuntu/Dockerfile diff --git a/3.0-spatial/x86_64/alpine/Dockerfile b/3.0-spatial/alpine/Dockerfile similarity index 100% rename from 3.0-spatial/x86_64/alpine/Dockerfile rename to 3.0-spatial/alpine/Dockerfile diff --git a/3.0-spatial/x86_64/openjdk-slim/Dockerfile b/3.0-spatial/openjdk-slim/Dockerfile similarity index 100% rename from 3.0-spatial/x86_64/openjdk-slim/Dockerfile rename to 3.0-spatial/openjdk-slim/Dockerfile diff --git a/3.0-tp3/x86_64/alpine/Dockerfile b/3.0-tp3/alpine/Dockerfile similarity index 100% rename from 3.0-tp3/x86_64/alpine/Dockerfile rename to 3.0-tp3/alpine/Dockerfile diff --git a/3.0-tp3/x86_64/alpine/gremlin-server.yaml b/3.0-tp3/alpine/gremlin-server.yaml similarity index 100% rename from 3.0-tp3/x86_64/alpine/gremlin-server.yaml rename to 3.0-tp3/alpine/gremlin-server.yaml diff --git a/3.0-tp3/x86_64/openjdk-slim/Dockerfile b/3.0-tp3/openjdk-slim/Dockerfile similarity index 100% rename from 3.0-tp3/x86_64/openjdk-slim/Dockerfile rename to 3.0-tp3/openjdk-slim/Dockerfile diff --git a/3.0-tp3/x86_64/openjdk-slim/gremlin-server.yaml b/3.0-tp3/openjdk-slim/gremlin-server.yaml similarity index 100% rename from 3.0-tp3/x86_64/openjdk-slim/gremlin-server.yaml rename to 3.0-tp3/openjdk-slim/gremlin-server.yaml diff --git a/3.0/arm64v8/alpine/Dockerfile b/3.0/alpine/Dockerfile similarity index 100% rename from 3.0/arm64v8/alpine/Dockerfile rename to 3.0/alpine/Dockerfile diff --git a/3.0/arm64v8/openjdk-slim/Dockerfile b/3.0/openjdk-slim/Dockerfile similarity index 98% rename from 3.0/arm64v8/openjdk-slim/Dockerfile rename to 3.0/openjdk-slim/Dockerfile index 60c44b0..1265fe7 100644 --- a/3.0/arm64v8/openjdk-slim/Dockerfile +++ b/3.0/openjdk-slim/Dockerfile @@ -2,7 +2,7 @@ # Dockerfile to run an OrientDB (Graph) Container ############################################################ -FROM openjdk:8-jdk-slim +FROM openjdk:11.0.8-jdk-slim MAINTAINER OrientDB LTD (info@orientdb.com) diff --git a/3.0/x86_64/rhel/Dockerfile b/3.0/rhel/Dockerfile similarity index 100% rename from 3.0/x86_64/rhel/Dockerfile rename to 3.0/rhel/Dockerfile diff --git a/3.0/x86_64/rhel/help.1 b/3.0/rhel/help.1 similarity index 100% rename from 3.0/x86_64/rhel/help.1 rename to 3.0/rhel/help.1 diff --git a/3.0/x86_64/rhel/help.1.md b/3.0/rhel/help.1.md similarity index 100% rename from 3.0/x86_64/rhel/help.1.md rename to 3.0/rhel/help.1.md diff --git a/3.0/ppc64le/ubuntu/Dockerfile b/3.0/ubuntu/Dockerfile similarity index 100% rename from 3.0/ppc64le/ubuntu/Dockerfile rename to 3.0/ubuntu/Dockerfile diff --git a/3.0/x86_64/alpine/Dockerfile b/3.0/x86_64/alpine/Dockerfile deleted file mode 100644 index b31d9d0..0000000 --- a/3.0/x86_64/alpine/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -############################################################ -# Dockerfile to run an OrientDB (Graph) Container -############################################################ - -FROM openjdk:8-jdk-alpine - -MAINTAINER OrientDB LTD (info@orientdb.com) - -# Override the orientdb download location with e.g.: -# docker build -t mine --build-arg ORIENTDB_DOWNLOAD_SERVER=https://repo1.maven.org/maven2/com/orientechnologies/ . -ARG ORIENTDB_DOWNLOAD_SERVER - -ENV ORIENTDB_VERSION 3.0.28 -ENV ORIENTDB_DOWNLOAD_MD5 931e22bb22e10af99f18144cbee04551 -ENV ORIENTDB_DOWNLOAD_SHA1 fc9f93773576fbf7493dbe8f8c6b784d0165d028 - -ENV ORIENTDB_DOWNLOAD_URL ${ORIENTDB_DOWNLOAD_SERVER:-https://repo1.maven.org/maven2/com/orientechnologies}/orientdb-community/$ORIENTDB_VERSION/orientdb-community-$ORIENTDB_VERSION.tar.gz - -RUN apk add --update tar curl \ - && rm -rf /var/cache/apk/* - -#download distribution tar, untar and delete databases -RUN mkdir /orientdb && \ - wget $ORIENTDB_DOWNLOAD_URL \ - && echo "$ORIENTDB_DOWNLOAD_MD5 *orientdb-community-$ORIENTDB_VERSION.tar.gz" | md5sum -c - \ - && echo "$ORIENTDB_DOWNLOAD_SHA1 *orientdb-community-$ORIENTDB_VERSION.tar.gz" | sha1sum -c - \ - && tar -xvzf orientdb-community-$ORIENTDB_VERSION.tar.gz -C /orientdb --strip-components=1 \ - && rm orientdb-community-$ORIENTDB_VERSION.tar.gz \ - && rm -rf /orientdb/databases/* - - -ENV PATH /orientdb/bin:$PATH - -VOLUME ["/orientdb/backup", "/orientdb/databases", "/orientdb/config"] - -WORKDIR /orientdb - -#OrientDb binary -EXPOSE 2424 - -#OrientDb http -EXPOSE 2480 - -# Default command start the server -CMD ["server.sh"] - diff --git a/3.0/x86_64/openjdk-slim/Dockerfile b/3.0/x86_64/openjdk-slim/Dockerfile deleted file mode 100644 index 60c44b0..0000000 --- a/3.0/x86_64/openjdk-slim/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -############################################################ -# Dockerfile to run an OrientDB (Graph) Container -############################################################ - -FROM openjdk:8-jdk-slim - -MAINTAINER OrientDB LTD (info@orientdb.com) - -# Override the orientdb download location with e.g.: -# docker build -t mine --build-arg ORIENTDB_DOWNLOAD_SERVER=https://repo1.maven.org/maven2/com/orientechnologies/ . -ARG ORIENTDB_DOWNLOAD_SERVER - -ENV ORIENTDB_VERSION 3.0.28 -ENV ORIENTDB_DOWNLOAD_MD5 931e22bb22e10af99f18144cbee04551 -ENV ORIENTDB_DOWNLOAD_SHA1 fc9f93773576fbf7493dbe8f8c6b784d0165d028 - -ENV ORIENTDB_DOWNLOAD_URL ${ORIENTDB_DOWNLOAD_SERVER:-https://repo1.maven.org/maven2/com/orientechnologies}/orientdb-community/$ORIENTDB_VERSION/orientdb-community-$ORIENTDB_VERSION.tar.gz - -RUN apt update \ - && apt install -y curl wget \ - && rm -rf /var/lib/apt/lists/* - -#download distribution tar, untar and delete databases -RUN mkdir /orientdb && \ - wget $ORIENTDB_DOWNLOAD_URL \ - && echo "$ORIENTDB_DOWNLOAD_MD5 *orientdb-community-$ORIENTDB_VERSION.tar.gz" | md5sum -c - \ - && echo "$ORIENTDB_DOWNLOAD_SHA1 *orientdb-community-$ORIENTDB_VERSION.tar.gz" | sha1sum -c - \ - && tar -xvzf orientdb-community-$ORIENTDB_VERSION.tar.gz -C /orientdb --strip-components=1 \ - && rm orientdb-community-$ORIENTDB_VERSION.tar.gz \ - && rm -rf /orientdb/databases/* - - -ENV PATH /orientdb/bin:$PATH - -VOLUME ["/orientdb/backup", "/orientdb/databases", "/orientdb/config"] - -WORKDIR /orientdb - -#OrientDb binary -EXPOSE 2424 - -#OrientDb http -EXPOSE 2480 - -# Default command start the server -CMD ["server.sh"] -