HPCC-22233 Update Dockerfiles for HPCC-7.2.14-1 and HPCC-7.0.40-1

hpcc-systems · May 30, 2019 · b992424 · b992424
1 parent 1f3a72b
commit b992424
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/7/Dockerfile b/7/Dockerfile
@@ -1,10 +1,16 @@
+
 FROM hpccsystems/hpcc-base:7-xenial
 
 RUN apt-get update && apt-get install -y iputils-ping curl xterm
 RUN groupadd hpcc && useradd -s /bin/bash -r -m -d /home/hpcc -g hpcc -c "hpcc Runtime User" hpcc
 
-ENV VERSION 7.2.10
-ENV FULL_VERSION 7.2.10-1
+<<<<<<< Updated upstream
+ENV VERSION 7.2.14
+ENV FULL_VERSION 7.2.14-1
+=======
+ENV VERSION 7.0.18
+ENV FULL_VERSION 7.0.18-1
+>>>>>>> Stashed changes
 #ENV PLATFORM_DOWNLOAD_MD5  ef58e94dcc66a45cb0fc8202e68b50d9
 ENV PLATFORM_PACKAGE hpccsystems-platform-community_${FULL_VERSION}xenial_amd64.deb
 

diff --git a/7/Dockerfile_FB b/7/Dockerfile_FB
@@ -7,8 +7,13 @@ RUN wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch |  apt-key add
 RUN apt-get update
 RUN apt-get install -y filebeat
 
-ENV VERSION 7.2.10
-ENV FULL_VERSION 7.2.10-1
+<<<<<<< Updated upstream
+ENV VERSION 7.2.14
+ENV FULL_VERSION 7.2.14-1
+=======
+ENV VERSION 7.0.18
+ENV FULL_VERSION 7.0.18-1
+>>>>>>> Stashed changes
 #ENV PLATFORM_DOWNLOAD_MD5  ef58e94dcc66a45cb0fc8202e68b50d9
 ENV PLATFORM_PACKAGE hpccsystems-platform-community_${FULL_VERSION}xenial_amd64.deb
 

diff --git a/7/Dockerfile_Spark b/7/Dockerfile_Spark
@@ -7,8 +7,13 @@ RUN apt-get install -y openjdk-8-jdk iproute2
 
 RUN groupadd hpcc && useradd -s /bin/bash -r -m -d /home/hpcc -g hpcc -c "hpcc Runtime User" hpcc
 
-ENV VERSION 7.2.10
-ENV FULL_VERSION 7.2.10-1
+<<<<<<< Updated upstream
+ENV VERSION 7.2.14
+ENV FULL_VERSION 7.2.14-1
+=======
+ENV VERSION 7.0.18
+ENV FULL_VERSION 7.0.18-1
+>>>>>>> Stashed changes
 #ENV PLATFORM_DOWNLOAD_MD5  a62b43a1ef1ecf7d8d702d9033e9cf39
 ENV PLATFORM_PACKAGE hpccsystems-platform-community_${FULL_VERSION}xenial_amd64.deb
 

diff --git a/README.md b/README.md
@@ -1,10 +1,22 @@
 
 # Docker HPCC
 ### Supported tags and respective Dockerfile links
-* 7.2.10-1 latest  [(7/Dockerfile)](https://github.com/hpcc-systems/docker-hpcc/tree/master/7/Dockerfile)
+<<<<<<< HEAD
+* 7.2.14-1 latest  [(7/Dockerfile)](https://github.com/hpcc-systems/docker-hpcc/tree/master/7/Dockerfile)
+* 7.2.12-1
+* 7.2.12-1
 * 7.2.8-1
 * 7.2.2-1
 * 7.2.0-rc4
+* 7.0.40-1
+=======
+* 7.2.12-1 latest  [(7/Dockerfile)](https://github.com/hpcc-systems/docker-hpcc/tree/master/7/Dockerfile)
+* 7.2.10-1
+* 7.2.8-1
+* 7.2.2-1
+* 7.2.0-rc4
+>>>>>>> 41a9fb8bdef38eaaccaa1f2c67f0181d240e6839
+* 7.0.38-1
 * 7.0.36-1
 * 7.0.34-1
 * 7.0.24-1