From 987ef6c51daece05188de4943190d2eb6142b34e Mon Sep 17 00:00:00 2001 From: JimMoen Date: Fri, 14 Apr 2023 15:42:44 +0800 Subject: [PATCH] revert: "build: docker file add unixodbc and msodbcsql17" This reverts commit 611edf422719069297219370fe120968737fc0cf. --- .gitignore | 1 - deploy/docker/Dockerfile | 16 +++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 3f7e268a2..62e8ddc81 100644 --- a/.gitignore +++ b/.gitignore @@ -71,4 +71,3 @@ apps/emqx/test/emqx_static_checks_data/master.bpapi lux_logs/ /.prepare bom.json -.dockerignore diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index dcebe9b1a..8f04c433c 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -29,19 +29,9 @@ COPY --from=builder /emqx-rel/emqx /opt/emqx RUN ln -s /opt/emqx/bin/* /usr/local/bin/ -RUN apt-get update \ - && apt-get install -y --no-install-recommends ca-certificates procps - -RUN apt-get update \ - && apt-get install -y gnupg2 curl apt-utils \ - && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \ - && curl https://packages.microsoft.com/config/debian/11/prod.list > /etc/apt/sources.list.d/mssql-release.list \ - && apt-get update \ - && ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev \ - && sed -i 's/ODBC Driver 17 for SQL Server/ms-sql/g' /etc/odbcinst.ini - -RUN apt-get clean && \ - rm -rf /var/lib/apt/lists/*; +RUN apt-get update; \ + apt-get install -y --no-install-recommends ca-certificates procps; \ + rm -rf /var/lib/apt/lists/* WORKDIR /opt/emqx