diff options
| author |   Mohammed Naser <mnaser@vexxhost.com> | 2018-04-16 13:36:16 -0700 |
|---|---|---|
| committer |   James Forsyth <jf2512@att.com> | 2018-05-23 20:40:21 +0000 |
| commit | 58377c868414816edae11ef24f6b8beee436ac1f (patch) | |
| tree | c9d045792b6c59f632fee65fcf46e19b08a5dd78 /src/main | |
| parent | 64af7d23db52c696ee60a30c2f8f03e2df90c934 (diff) | |
Dynamically determine image architecture
The image architecture is currently hardcoded, this patch removes
that hardcoded value to allow for ARM64 builds to go through.
Change-Id: I50b7d3a270165852930c0ce5786121edbef61d08
Issue-ID: CIMAN-154
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/docker/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 10c4dd0..b76edfe 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y software-properties-common ## sudo -E is required to preserve the environment. If you remove that line, it will most like freeze at this step RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk ## Setup JAVA_HOME, this is useful for docker commandline -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture) RUN export JAVA_HOME # Build up the deployment folder structure |