Add templating for ARCH and DESTCPU variables

Signed-off-by: Stewart X Addison <[email protected]>

Author: sxa

ansible/roles/docker/templates/alpine311.Dockerfile.j2

@@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
 ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
 ENV OSTYPE linux-gnu
 ENV OSVARIANT docker
-ENV DESTCPU x64
-ENV ARCH x64
+ENV DESTCPU {{ arch }}
+ENV ARCH {{ arch }}
 
 RUN apk add --no-cache --upgrade apk-tools
 

ansible/roles/docker/templates/alpine312.Dockerfile.j2

@@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
 ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
 ENV OSTYPE linux-gnu
 ENV OSVARIANT docker
-ENV DESTCPU x64
-ENV ARCH x64
+ENV DESTCPU {{ arch }}
+ENV ARCH {{ arch }}
 
 RUN apk add --no-cache --upgrade apk-tools
 

ansible/roles/docker/templates/ubi81.Dockerfile.j2

@@ -9,8 +9,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
 ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
 ENV OSTYPE linux-gnu
 ENV OSVARIANT docker
-ENV DESTCPU x64
-ENV ARCH x64
+ENV DESTCPU {{ arch }}
+ENV ARCH {{ arch }}
 
 # ccache is not in the default repositories so get it from EPEL 8.
 RUN dnf install --disableplugin=subscription-manager -y \

ansible/roles/docker/templates/ubuntu1604.Dockerfile.j2

@@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
 ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
 ENV OSTYPE linux-gnu
 ENV OSVARIANT docker
-ENV DESTCPU x64
-ENV ARCH x64
+ENV DESTCPU {{ arch }}
+ENV ARCH {{ arch }}
 
 RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
     ccache \

ansible/roles/docker/templates/ubuntu1604_arm_cross.Dockerfile.j2

@@ -50,8 +50,8 @@ ENV USER={{ server_user }} \
   NODE_TEST_DIR=/home/{{ server_user }}/tmp \
   OSTYPE=linux-gnu \
   OSVARIANT=docker \
-  DESTCPU=x64 \
-  ARCH=x64 \
+  DESTCPU={{ arch }} \
+  ARCH={{ arch }} \
   CCACHE_TEMPDIR=/home/{{ server_user }}/.ccache/{{ item.name }}
 
 CMD cd /home/{{ server_user }} \

ansible/roles/docker/templates/ubuntu1804.Dockerfile.j2

@@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
 ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
 ENV OSTYPE linux-gnu
 ENV OSVARIANT docker
-ENV DESTCPU x64
-ENV ARCH x64
+ENV DESTCPU {{ arch }}
+ENV ARCH {{ arch }}
 
 RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
     ccache \

ansible/roles/docker/templates/ubuntu1804_arm_cross.Dockerfile.j2

@@ -51,8 +51,8 @@ ENV USER={{ server_user }} \
   NODE_TEST_DIR=/home/{{ server_user }}/tmp \
   OSTYPE=linux-gnu \
   OSVARIANT=docker \
-  DESTCPU=x64 \
-  ARCH=x64 \
+  DESTCPU={{ arch }} \
+  ARCH={{ arch }} \
   CCACHE_TEMPDIR=/home/{{ server_user }}/.ccache/{{ item.name }}
 
 CMD cd /home/{{ server_user }} \

ansible/roles/docker/templates/ubuntu1804_sharedlibs.Dockerfile.j2

@@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
 ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
 ENV OSTYPE linux-gnu
 ENV OSVARIANT docker
-ENV DESTCPU x64
-ENV ARCH x64
+ENV DESTCPU {{ arch }}
+ENV ARCH {{ arch }}
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && apt-get install apt-utils -y && \

ansible/roles/docker/templates/ubuntu2004.Dockerfile.j2

@@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
 ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
 ENV OSTYPE linux-gnu
 ENV OSVARIANT docker
-ENV DESTCPU x64
-ENV ARCH x64
+ENV DESTCPU {{ arch }}
+ENV ARCH {{ arch }}
 
 RUN apt-get update && apt-get dist-upgrade -y && apt-get install -y \
     ccache \

ansible/roles/docker/templates/ubuntu2004_sharedlibs.Dockerfile.j2

@@ -10,8 +10,8 @@ ENV NODE_COMMON_PIPE /home/{{ server_user }}/test.pipe
 ENV NODE_TEST_DIR /home/{{ server_user }}/tmp
 ENV OSTYPE linux-gnu
 ENV OSVARIANT docker
-ENV DESTCPU x64
-ENV ARCH x64
+ENV DESTCPU {{ arch }}
+ENV ARCH {{ arch }}
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && apt-get install apt-utils -y && \