diff options
| author |   Mohammed Naser <mnaser@vexxhost.com> | 2018-04-16 10:20:18 -0700 |
|---|---|---|
| committer | Mohammed Naser <mnaser@vexxhost.com> | 2018-04-16 10:21:42 -0700 |
| commit | f25d658ef9a096dffe0c47c7d26688bf2476c074 (patch) | |
| tree | 83092e4ff3dabb732114fd262bcc6cd36f09ae66 /standalone/src/main/assembly | |
| parent | 555583b85e88b0767b877bd3cb30301571005884 (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: I5ba78af8853620f03697c3a59b1288b9c25fbb49
Issue-ID: CIMAN-154
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
Diffstat (limited to 'standalone/src/main/assembly')
| -rw-r--r-- | standalone/src/main/assembly/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/standalone/src/main/assembly/Dockerfile b/standalone/src/main/assembly/Dockerfile index 952c871..3ccd857 100644 --- a/standalone/src/main/assembly/Dockerfile +++ b/standalone/src/main/assembly/Dockerfile @@ -10,9 +10,9 @@ RUN apt-get update RUN apt-get install -y openjdk-8-jdk #configure the JDK -RUN sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 -ENV PATH $PATH:/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:/usr/lib/jvm/java-8-openjdk-amd64/bin +RUN sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/jre/lib/security/java.security +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture) +ENV PATH $PATH:/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/jre/bin:/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/bin ENV CLASSPATH .:${JAVA_HOME}/lib:${JRE_HOME}/lib ENV JRE_HOME ${JAVA_HOME}/jre |