Merge branch 'master' into hotfix/consumer-connect

Author: chrismaddalena

compose/local/hasura/Dockerfile

@@ -1,6 +1,7 @@
 FROM hasura/graphql-engine:v2.39.1.cli-migrations-v3
 
-RUN apt-get update \
+RUN rm -f /etc/apt/sources.list.d/microsoft-prod.list \
+    && apt-get update \
     && apt-get install -y --no-install-recommends curl \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*

compose/production/hasura/Dockerfile

@@ -1,6 +1,7 @@
 FROM hasura/graphql-engine:v2.39.1.cli-migrations-v3
 
-RUN apt-get update \
+RUN rm -f /etc/apt/sources.list.d/microsoft-prod.list \
+    && apt-get update \
     && apt-get install -y --no-install-recommends curl \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*