diff options
| author |   Mohammed Naser <mnaser@vexxhost.com> | 2018-04-16 12:58:21 -0700 |
|---|---|---|
| committer |   James Forsyth <jf2512@att.com> | 2018-05-23 20:44:10 +0000 |
| commit | 7753d7e90f5d91b143043a642e90dd30806da2ba (patch) | |
| tree | a64784db1c7d2849cbaa94289819894ebd01625d /src/main/docker | |
| parent | b6e36aeb27f0275e0f2e7668f49f817982914374 (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: I9245037abfe32a8b7efd83b7558755f94c22df6e
Issue-ID: CIMAN-154
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
Diffstat (limited to 'src/main/docker')
| -rw-r--r-- | src/main/docker/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index b4e638a..6ccffec 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 @@ -31,4 +31,4 @@ COPY bundleconfig-local/etc/logback.xml $MICRO_HOME/bundleconfig/etc EXPOSE 9502 9502 -CMD ["/opt/app/data-router/bin/start.sh"]
\ No newline at end of file +CMD ["/opt/app/data-router/bin/start.sh"] |