From 33f2fdd49cae50c93cbf1f8544402bda41070a01 Mon Sep 17 00:00:00 2001 From: Preet Shah <48907607+preetsshah@users.noreply.github.com> Date: Fri, 15 Dec 2023 15:46:30 +0530 Subject: [PATCH] Update Dockerfile.ci file to use new MySQL Keys (#14400) * Update Dockerfile.ci file to use new MySQL Keys * Update ingestion Dockerfiles files to use new MySQL Keys * Update ingestion Dockerfiles files * Update Dockerfiles to not hardcode the new keys * Update comments --- ingestion/Dockerfile | 4 ++++ ingestion/Dockerfile.ci | 4 ++++ ingestion/operators/docker/Dockerfile | 3 +++ 3 files changed, 11 insertions(+) diff --git a/ingestion/Dockerfile b/ingestion/Dockerfile index a24608c3277..da1ab33eed1 100644 --- a/ingestion/Dockerfile +++ b/ingestion/Dockerfile @@ -2,6 +2,10 @@ FROM apache/airflow:2.6.3-python3.10 USER root RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | apt-key add - RUN curl -sS https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list + +# Remove expired mysql keys +RUN rm /etc/apt/sources.list.d/mysql.list + # Install Dependencies (listed in alphabetical order) ENV DEBIAN_FRONTEND=noninteractive RUN apt-get -qq update \ diff --git a/ingestion/Dockerfile.ci b/ingestion/Dockerfile.ci index 6e8eafca034..41983eb2422 100644 --- a/ingestion/Dockerfile.ci +++ b/ingestion/Dockerfile.ci @@ -2,6 +2,10 @@ FROM apache/airflow:2.6.3-python3.10 USER root RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | apt-key add - RUN curl -sS https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list + +# Remove expired mysql keys +RUN rm /etc/apt/sources.list.d/mysql.list + # Install Dependencies (listed in alphabetical order) RUN apt-get -qq update \ && apt-get -qq install -y \ diff --git a/ingestion/operators/docker/Dockerfile b/ingestion/operators/docker/Dockerfile index 2fca6c00304..0a7ff364ad4 100644 --- a/ingestion/operators/docker/Dockerfile +++ b/ingestion/operators/docker/Dockerfile @@ -3,6 +3,9 @@ FROM python:3.10-bullseye RUN curl -sS https://packages.microsoft.com/keys/microsoft.asc | apt-key add - RUN curl -sS https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list +# Remove expired mysql keys +RUN rm /etc/apt/sources.list.d/mysql.list + # Install Dependencies (listed in alphabetical order) RUN apt-get -qq update \ && apt-get -qq install -y \