From d1bd51b62aaf81045a65761a801e0e252655120f Mon Sep 17 00:00:00 2001 From: Shane Loretz Date: Wed, 13 Sep 2017 08:14:46 -0700 Subject: [PATCH 1/2] Install opensplice on aarch64 --- linux_docker_resources/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux_docker_resources/Dockerfile b/linux_docker_resources/Dockerfile index a21fbdf6b..d09e2fa7d 100644 --- a/linux_docker_resources/Dockerfile +++ b/linux_docker_resources/Dockerfile @@ -42,9 +42,9 @@ RUN pip3 install -U setuptools pip virtualenv RUN apt-get update && apt-get install --no-install-recommends -y gcovr # Install the OpenSplice binary from the OSRF repositories. -RUN if test ${PLATFORM} = x86; then apt-get update && apt-get install --no-install-recommends -y libopensplice67=6.7.0+osrf2-2~xenial; fi +RUN if test \( ${PLATFORM} = aarch64 -o ${PLATFORM} = x86 \) ; then apt-get update && apt-get install --no-install-recommends -y libopensplice67=6.7.0+osrf2-2~xenial; fi # Update default domain id. -RUN if test ${PLATFORM} = x86; then sed -i "s/0<\/Id>/108<\/Id>/" /usr/etc/opensplice/config/ospl.xml; fi +RUN if test \( ${PLATFORM} = aarch64 -o ${PLATFORM} = x86 \) ; then sed -i "s/0<\/Id>/108<\/Id>/" /usr/etc/opensplice/config/ospl.xml; fi # Install the RTI dependencies. RUN if test ${PLATFORM} = x86; then apt-get update && apt-get install --no-install-recommends -y default-jre-headless; fi From 3c2fe6ac7e0520e6832f468d6b1560b87bc9889a Mon Sep 17 00:00:00 2001 From: Shane Loretz Date: Wed, 13 Sep 2017 08:24:07 -0700 Subject: [PATCH 2/2] aarch64 -> arm --- linux_docker_resources/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux_docker_resources/Dockerfile b/linux_docker_resources/Dockerfile index d09e2fa7d..ad0cb5943 100644 --- a/linux_docker_resources/Dockerfile +++ b/linux_docker_resources/Dockerfile @@ -42,9 +42,9 @@ RUN pip3 install -U setuptools pip virtualenv RUN apt-get update && apt-get install --no-install-recommends -y gcovr # Install the OpenSplice binary from the OSRF repositories. -RUN if test \( ${PLATFORM} = aarch64 -o ${PLATFORM} = x86 \) ; then apt-get update && apt-get install --no-install-recommends -y libopensplice67=6.7.0+osrf2-2~xenial; fi +RUN if test \( ${PLATFORM} = arm -o ${PLATFORM} = x86 \) ; then apt-get update && apt-get install --no-install-recommends -y libopensplice67=6.7.0+osrf2-2~xenial; fi # Update default domain id. -RUN if test \( ${PLATFORM} = aarch64 -o ${PLATFORM} = x86 \) ; then sed -i "s/0<\/Id>/108<\/Id>/" /usr/etc/opensplice/config/ospl.xml; fi +RUN if test \( ${PLATFORM} = arm -o ${PLATFORM} = x86 \) ; then sed -i "s/0<\/Id>/108<\/Id>/" /usr/etc/opensplice/config/ospl.xml; fi # Install the RTI dependencies. RUN if test ${PLATFORM} = x86; then apt-get update && apt-get install --no-install-recommends -y default-jre-headless; fi