remove image-mdm

.pipelines/build.yml

@@ -12,8 +12,6 @@ jobs:
           makefile.target: "image-aro"
         Proxy:
           makefile.target: "image-proxy"
-        MDM:
-          makefile.target: "image-mdm"
 
     steps:
       - template: ./templates/template-setup-golang-env.yml

Dockerfile.mdm

@@ -1,14 +0,0 @@
-ARG VERSION
-FROM ubuntu:bionic
-RUN apt-get update && \
-  apt-get -y dist-upgrade && \
-  apt-get install -y curl && \
-  curl -o metricsext2.deb https://packages.microsoft.com/repos/azurecore/pool/main/m/metricsext2/metricsext2_$VERSION.deb && \
-  apt-get install -y ./metricsext2.deb && \
-  rm metricsext2.deb && \
-  apt-get purge -y curl && \
-  apt-get autoremove -y && \
-  rm -rf /var/lib/apt/lists/* && \
-  chown -R 1000:1000 /var/etw
-ENTRYPOINT ["MetricsExtension"]
-USER 1000

Makefile

@@ -55,10 +55,6 @@ image-aro: aro
 	docker pull registry.access.redhat.com/ubi8/ubi-minimal
 	docker build -f Dockerfile.aro -t arosvc.azurecr.io/aro:$(COMMIT) .
 
-image-mdm:
-	docker build --build-arg VERSION=2.2019.801.1228-66cac1-~bionic_amd64 \
-	  -f Dockerfile.mdm -t arosvc.azurecr.io/mdm:2019.801.1228-66cac1 .
-
 image-proxy: proxy
 	docker pull registry.access.redhat.com/ubi8/ubi-minimal
 	docker build -f Dockerfile.proxy -t arosvc.azurecr.io/proxy:latest .

pkg/deploy/rp.go

@@ -404,7 +404,6 @@ EOF
 az login -i --allow-no-subscriptions
 
 az keyvault secret download --file /etc/mdm.pem --id "$MDMCERTIFICATEVAULTID"
-chown 1000:1000 /etc/mdm.pem
 chmod 0600 /etc/mdm.pem
 
 az keyvault secret download --file /etc/mdsd.pem --id "$MDSDCERTIFICATEVAULTID"
@@ -435,7 +434,7 @@ EOF
 
 cat >/etc/sysconfig/mdm <<EOF
 MDMFRONTENDURL='$MDMFRONTENDURL'
-MDMIMAGE='arosvc.azurecr.io/mdm:2019.801.1228-66cac1'
+MDMIMAGE=arosvc.azurecr.io/genevamdm:master_31
 MDMMETRICNAMESPACE='$MDMMETRICNAMESPACE'
 MDMMONITORINGACCOUNT='$MDMMONITORINGACCOUNT'
 EOF
@@ -449,6 +448,7 @@ EnvironmentFile=/etc/sysconfig/mdm
 ExecStartPre=-/usr/bin/docker rm -f %N
 ExecStartPre=/usr/bin/docker pull $MDMIMAGE
 ExecStart=/usr/bin/docker run \
+  --entrypoint /usr/sbin/MetricsExtension \
   --hostname %H \
   --name %N \
   --rm \