Build container images with race flag enabled

docker/Dockerfile-controller

@@ -1,6 +1,7 @@
 ARG basetag=latest
 ARG baserepo=quay.io/noirolabs
 FROM ${baserepo}/aci-containers-controller-base:${basetag}
+ARG binarypath=dist-static
 # Required OpenShift Labels
 LABEL name="ACI CNI Containers Controller" \
 vendor="Cisco" \
@@ -11,7 +12,7 @@ description="This will deploy a single instance of ACI CNI Containers Controller
 # Required Licenses
 COPY docker/licenses /licenses
 COPY pkg/istiocrd/upstream-istio-cr.yaml /usr/local/var/lib/aci-cni/upstream-istio-ctrlplane-resource.yaml
-COPY dist-static/aci-containers-controller /usr/local/bin/
+COPY ${binarypath}/aci-containers-controller /usr/local/bin/
 ENV AWS_SUBNETS="None"
 ENV AWS_VPCID="None"
 ENTRYPOINT exec /usr/local/bin/aci-containers-controller -config-path /usr/local/etc/aci-containers/controller.conf -aws-subnets $AWS_SUBNETS -vpc-id $AWS_VPCID

docker/Dockerfile-host

@@ -1,6 +1,7 @@
 ARG basetag=latest
 ARG baserepo=quay.io/noirolabs
 FROM ${baserepo}/aci-containers-host-base:${basetag}
+ARG binarypath=dist-static
 # Required OpenShift Labels
 LABEL name="ACI CNI Host-Agent" \
 vendor="Cisco" \
@@ -10,7 +11,7 @@ summary="This is an ACI CNI Host-Agent." \
 description="This will deploy a single instance of ACI CNI Host-Agent."
 # Required Licenses
 COPY docker/licenses /licenses
-COPY dist-static/aci-containers-host-agent dist-static/opflex-agent-cni dist-static/netop-cni docker/launch-hostagent.sh docker/enable-hostacc.sh docker/enable-droplog.sh /usr/local/bin/
+COPY ${binarypath}/aci-containers-host-agent dist-static/opflex-agent-cni dist-static/netop-cni docker/launch-hostagent.sh docker/enable-hostacc.sh docker/enable-droplog.sh /usr/local/bin/
 COPY docker/launch-lsyncd.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/launch-lsyncd.sh
 RUN echo "send dhcp-client-identifier = hardware;" >  /usr/local/etc/dhclient.conf

docker/Dockerfile-operator

@@ -1,6 +1,7 @@
 ARG basetag=latest
 ARG baserepo=quay.io/noirolabs
 FROM ${baserepo}/aci-containers-operator-base:${basetag}
+ARG binarypath=dist-static
 # Required OpenShift Labels
 LABEL name="ACI CNI Operator" \
 vendor="Cisco" \
@@ -10,5 +11,5 @@ summary="This is an ACI CNI Operator." \
 description="This operator will deploy a single instance of ACI CNI Operator."
 # Required Licenses
 COPY docker/licenses /licenses
-COPY dist-static/aci-containers-operator /usr/local/bin/
+COPY ${binarypath}/aci-containers-operator /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/aci-containers-operator"]

docker/travis/Dockerfile-controller

@@ -1,4 +1,5 @@
 FROM registry.access.redhat.com/ubi9/ubi:latest
+ARG binarypath=dist-static
 # Required OpenShift Labels
 LABEL name="ACI CNI Containers Controller" \
 vendor="Cisco" \
@@ -16,7 +17,7 @@ RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s
   && chmod u+x istio-1.18.2/bin/istioctl && mv istio-1.18.2/bin/istioctl /usr/local/bin/istioctl \
   && mkdir -p /usr/local/var/lib/aci-cni
 COPY pkg/istiocrd/upstream-istio-cr.yaml /usr/local/var/lib/aci-cni/upstream-istio-ctrlplane-resource.yaml
-COPY dist-static/aci-containers-controller /usr/local/bin/
+COPY ${binarypath}/aci-containers-controller /usr/local/bin/
 ENV AWS_SUBNETS="None"
 ENV AWS_VPCID="None"
 ENTRYPOINT exec /usr/local/bin/aci-containers-controller -config-path /usr/local/etc/aci-containers/controller.conf -aws-subnets $AWS_SUBNETS -vpc-id $AWS_VPCID

docker/travis/Dockerfile-host

@@ -57,5 +57,6 @@ RUN mv /usr/local/bin/aci-containers-host-agent-ovscni /usr/local/bin/aci-contai
 CMD ["/usr/local/bin/launch-hostagent.sh"]
 
 FROM base as without-ovscni
-COPY dist-static/aci-containers-host-agent dist-static/opflex-agent-cni dist-static/netop-cni docker/launch-hostagent.sh docker/enable-hostacc.sh docker/enable-droplog.sh /usr/local/bin/
+ARG binarypath=dist-static
+COPY ${binarypath}/aci-containers-host-agent dist-static/opflex-agent-cni dist-static/netop-cni docker/launch-hostagent.sh docker/enable-hostacc.sh docker/enable-droplog.sh /usr/local/bin/
 CMD ["/usr/local/bin/launch-hostagent.sh"]

docker/travis/Dockerfile-operator

@@ -1,4 +1,5 @@
 FROM registry.access.redhat.com/ubi9/ubi:latest
+ARG binarypath=dist-static
 # Required OpenShift Labels
 LABEL name="ACI CNI Operator" \
 vendor="Cisco" \
@@ -12,5 +13,5 @@ RUN yum install --disablerepo=* --enablerepo=ubi-9-appstream-rpms --enablerepo=u
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.21.3/bin/linux/amd64/kubectl \
   && chmod u+x kubectl && mv kubectl /usr/local/bin/kubectl
 COPY docker/licenses /licenses
-COPY dist-static/aci-containers-operator /usr/local/bin/
+COPY ${binarypath}/aci-containers-operator /usr/local/bin/
 ENTRYPOINT ["/usr/local/bin/aci-containers-operator"]