From 5fb6c3e8c0830e3773335fb744b310550632824a Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 25 Feb 2019 16:39:53 -0500 Subject: [PATCH 1/3] Add Docker build type This commit adds a new build type (together with deb/rpm/tar/zip) to represent the official Docker images. This build type will be displayed in APIs such as the main and nodes info APIs. --- distribution/docker/src/docker/Dockerfile | 1 + server/src/main/java/org/elasticsearch/Build.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/distribution/docker/src/docker/Dockerfile b/distribution/docker/src/docker/Dockerfile index aad9c05b11d55..11f46795a6563 100644 --- a/distribution/docker/src/docker/Dockerfile +++ b/distribution/docker/src/docker/Dockerfile @@ -31,6 +31,7 @@ WORKDIR /usr/share/elasticsearch ${source_elasticsearch} RUN tar zxf /opt/${elasticsearch} --strip-components=1 +RUN sed -ie 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' /usr/share/elasticsearch/bin/elasticsearch-env RUN mkdir -p config data logs RUN chmod 0775 config data logs COPY config/elasticsearch.yml config/log4j2.properties config/ diff --git a/server/src/main/java/org/elasticsearch/Build.java b/server/src/main/java/org/elasticsearch/Build.java index 9e659bb4145bb..dcf827091f54e 100644 --- a/server/src/main/java/org/elasticsearch/Build.java +++ b/server/src/main/java/org/elasticsearch/Build.java @@ -75,6 +75,7 @@ public static Flavor fromDisplayName(final String displayName) { public enum Type { DEB("deb"), + DOCKER("docker"), RPM("rpm"), TAR("tar"), ZIP("zip"), @@ -94,6 +95,8 @@ public static Type fromDisplayName(final String displayName) { switch (displayName) { case "deb": return Type.DEB; + case "docker": + return Type.DOCKER; case "rpm": return Type.RPM; case "tar": From 90d2e0d88f35d9ca69ef9cf8317463e8ae5fdb5f Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Tue, 26 Feb 2019 05:45:51 -0500 Subject: [PATCH 2/3] Make command slightly less brittle --- distribution/docker/src/docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/distribution/docker/src/docker/Dockerfile b/distribution/docker/src/docker/Dockerfile index 11f46795a6563..b28f1d586a8d7 100644 --- a/distribution/docker/src/docker/Dockerfile +++ b/distribution/docker/src/docker/Dockerfile @@ -31,7 +31,8 @@ WORKDIR /usr/share/elasticsearch ${source_elasticsearch} RUN tar zxf /opt/${elasticsearch} --strip-components=1 -RUN sed -ie 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' /usr/share/elasticsearch/bin/elasticsearch-env +RUN grep ES_DISTRIBUTION_TYPE=far /usr/share/elasticsearch/bin/elasticsearch-env \ + && sed -ie 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' /usr/share/elasticsearch/bin/elasticsearch-env RUN mkdir -p config data logs RUN chmod 0775 config data logs COPY config/elasticsearch.yml config/log4j2.properties config/ From 285200304e6c4d00b67176e15f639c00fe18dba2 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Tue, 26 Feb 2019 05:53:21 -0500 Subject: [PATCH 3/3] Fix purposeful typo to test, forgot to revert --- distribution/docker/src/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/docker/src/docker/Dockerfile b/distribution/docker/src/docker/Dockerfile index b28f1d586a8d7..8bcf70d192c5c 100644 --- a/distribution/docker/src/docker/Dockerfile +++ b/distribution/docker/src/docker/Dockerfile @@ -31,7 +31,7 @@ WORKDIR /usr/share/elasticsearch ${source_elasticsearch} RUN tar zxf /opt/${elasticsearch} --strip-components=1 -RUN grep ES_DISTRIBUTION_TYPE=far /usr/share/elasticsearch/bin/elasticsearch-env \ +RUN grep ES_DISTRIBUTION_TYPE=tar /usr/share/elasticsearch/bin/elasticsearch-env \ && sed -ie 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' /usr/share/elasticsearch/bin/elasticsearch-env RUN mkdir -p config data logs RUN chmod 0775 config data logs