Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-22087 Update Dockerfiles for HPCC-7.0.36-1 and 7.2.8-1 #16

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ 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.0.18
ENV FULL_VERSION 7.0.18-1
ENV VERSION 7.4.0
ENV FULL_VERSION 7.4.0-1
#ENV PLATFORM_DOWNLOAD_MD5 ef58e94dcc66a45cb0fc8202e68b50d9
ENV PLATFORM_PACKAGE hpccsystems-platform-community_${FULL_VERSION}xenial_amd64.deb

Expand Down
4 changes: 2 additions & 2 deletions 7/Dockerfile_FB
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ 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.0.18
ENV FULL_VERSION 7.0.18-1
ENV VERSION 7.4.0
ENV FULL_VERSION 7.4.0-1
#ENV PLATFORM_DOWNLOAD_MD5 ef58e94dcc66a45cb0fc8202e68b50d9
ENV PLATFORM_PACKAGE hpccsystems-platform-community_${FULL_VERSION}xenial_amd64.deb

Expand Down
4 changes: 2 additions & 2 deletions 7/Dockerfile_Spark
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ 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.0.18
ENV FULL_VERSION 7.0.18-1
ENV VERSION 7.4.0
ENV FULL_VERSION 7.4.0-1
#ENV PLATFORM_DOWNLOAD_MD5 a62b43a1ef1ecf7d8d702d9033e9cf39
ENV PLATFORM_PACKAGE hpccsystems-platform-community_${FULL_VERSION}xenial_amd64.deb

Expand Down
21 changes: 16 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@

# Docker HPCC
### Supported tags and respective Dockerfile links
* 7.0.18-1 latest [(7/Dockerfile)](https://github.com/hpcc-systems/docker-hpcc/tree/master/7/Dockerfile)
* 7.4.0-1 latest [(7/Dockerfile)](https://github.com/hpcc-systems/docker-hpcc/tree/master/7/Dockerfile)
* 7.2.20-1
* 7.2.16-1
* 7.2.14-1
* 7.2.8-1
* 7.2.2-1
* 7.2.0-rc4
* 7.0.40-1
* 7.0.34-1
* 7.0.24-1
* 7.0.20-1
* 7.0.18-1
* 7.0.16-1
* 7.0.14-1
* 7.0.8-1
Expand Down Expand Up @@ -70,16 +81,16 @@ There are two Linux distributions: Ubuntu (Ubuntu 16.04, default) and CentOS (Ce

### Update HPCC Platform Version
Make sure the HPCC Platform version is available in HPCCSystems.com -> "Download" -> "HPCC SYSTEM PLATFORM"
Update the version with update.sh. For example, if you want to build 6.4.14-1:
Update the version with update.sh. For example, if you want to build 7.2.8-1:
```sh
./update 6.4.18-1
./update 7.2.8-1
```
### Build
You can go to the directory of interest which contains the Dockerfile to run the build, or you can run the test-build.sh script which includes test:
```sh
sudo ./test-build.sh -v 6 -l ubuntu -p platform
sudo ./test-build.sh -v 7 -l ubuntu -p platform
```
This will build HPCC Platform 6.x for Ubuntu 16.04.
This will build HPCC Platform 7.x for Ubuntu 16.04.

To upload a build image to Docker Hub:
```sh
Expand Down
4 changes: 2 additions & 2 deletions test-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ function build()

}

versions=("6")
versions=("7")
packages=("platform")
variants=("ubuntu")
inTag=
latestRelease=6
latestRelease=7
repo="hpccsystems/hpcc"

distro_tag["centos"]="el7"
Expand Down