From 69374ff09f60fe64b59bb70aeee23f8ddab8d692 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Tue, 16 Oct 2018 09:04:23 +0100 Subject: [PATCH] Re-structure inline with Docker's Official Images guidelines In order for this repository to reach acceptance standards for multi-arch in Docker's Official Images repo the guidelines [0] need to be followed. This change adapts the directory-level sorting order from -- to -- where can be omitted from the latter structure when a Dockerfile supports multiple architectures. A good example of that is the Dockerfile for 3.0 based on Alpine, which can support both ARM64v8 (AArch64) and x86_64 (and probably some other architectures too [untested]) without changes. [0] https://github.com/docker-library/official-images#multiple-architectures Signed-off-by: Lee Jones --- 2.2-spatial/{x86_64 => }/alpine/Dockerfile | 0 2.2/{x86_64 => }/alpine-ibm/Dockerfile | 0 2.2/{x86_64 => }/alpine/Dockerfile | 0 .../ubuntu => ibmjava/ppc64le}/Dockerfile | 0 2.2/{x86_64 => }/rhel/Dockerfile | 0 2.2/{x86_64 => }/rhel/help.1 | 0 2.2/{x86_64 => }/rhel/help.1.md | 0 3.0-spatial/{x86_64 => }/alpine/Dockerfile | 0 3.0-tp3/{x86_64 => }/alpine/Dockerfile | 0 .../{x86_64 => }/alpine/gremlin-server.yaml | 0 3.0/{arm64v8 => }/alpine/Dockerfile | 0 .../ubuntu => ibmjava/ppc64le}/Dockerfile | 0 3.0/{x86_64 => }/rhel/Dockerfile | 0 3.0/{x86_64 => }/rhel/help.1 | 0 3.0/{x86_64 => }/rhel/help.1.md | 0 3.0/x86_64/alpine/Dockerfile | 46 ------------------- 16 files changed, 46 deletions(-) rename 2.2-spatial/{x86_64 => }/alpine/Dockerfile (100%) rename 2.2/{x86_64 => }/alpine-ibm/Dockerfile (100%) rename 2.2/{x86_64 => }/alpine/Dockerfile (100%) rename 2.2/{ppc64le/ubuntu => ibmjava/ppc64le}/Dockerfile (100%) rename 2.2/{x86_64 => }/rhel/Dockerfile (100%) rename 2.2/{x86_64 => }/rhel/help.1 (100%) rename 2.2/{x86_64 => }/rhel/help.1.md (100%) rename 3.0-spatial/{x86_64 => }/alpine/Dockerfile (100%) rename 3.0-tp3/{x86_64 => }/alpine/Dockerfile (100%) rename 3.0-tp3/{x86_64 => }/alpine/gremlin-server.yaml (100%) rename 3.0/{arm64v8 => }/alpine/Dockerfile (100%) rename 3.0/{ppc64le/ubuntu => ibmjava/ppc64le}/Dockerfile (100%) rename 3.0/{x86_64 => }/rhel/Dockerfile (100%) rename 3.0/{x86_64 => }/rhel/help.1 (100%) rename 3.0/{x86_64 => }/rhel/help.1.md (100%) delete mode 100644 3.0/x86_64/alpine/Dockerfile 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/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/ppc64le/ubuntu/Dockerfile b/2.2/ibmjava/ppc64le/Dockerfile similarity index 100% rename from 2.2/ppc64le/ubuntu/Dockerfile rename to 2.2/ibmjava/ppc64le/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/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-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/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/ppc64le/ubuntu/Dockerfile b/3.0/ibmjava/ppc64le/Dockerfile similarity index 100% rename from 3.0/ppc64le/ubuntu/Dockerfile rename to 3.0/ibmjava/ppc64le/Dockerfile 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/x86_64/alpine/Dockerfile b/3.0/x86_64/alpine/Dockerfile deleted file mode 100644 index fb943e9..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=http://repo1.maven.org/maven2/com/orientechnologies/ . -ARG ORIENTDB_DOWNLOAD_SERVER - -ENV ORIENTDB_VERSION 3.0.9 -ENV ORIENTDB_DOWNLOAD_MD5 ec4fc051c8d7f01e2490cfa10c0a9d5a -ENV ORIENTDB_DOWNLOAD_SHA1 129d0f2eb9db3d611c7347361a0db7f6307ea20d - -ENV ORIENTDB_DOWNLOAD_URL ${ORIENTDB_DOWNLOAD_SERVER:-http://central.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"] -