From 61ed001a48e5a4327d29d604dba78c82e28741bc Mon Sep 17 00:00:00 2001 From: "Michael J. Ryan" Date: Fri, 7 Feb 2020 13:58:02 -0700 Subject: [PATCH 1/2] Update Dockerfile Add sqlpackage to mssql-tools image. --- linux/mssql-tools/Dockerfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/linux/mssql-tools/Dockerfile b/linux/mssql-tools/Dockerfile index b0024dc7..49d0dce5 100644 --- a/linux/mssql-tools/Dockerfile +++ b/linux/mssql-tools/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="SQL Server Engineering Team" # apt-get and system utilities RUN apt-get update && apt-get install -y \ - curl apt-transport-https debconf-utils \ + curl apt-transport-https debconf-utils unzip \ && rm -rf /var/lib/apt/lists/* # adding custom MS repository @@ -14,7 +14,15 @@ RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt # install SQL Server drivers and tools RUN apt-get update && ACCEPT_EULA=Y apt-get install -y msodbcsql mssql-tools -RUN echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc + +# Install SQLPackage for Linux and make it executable +RUN wget -O /tmp/sqlpackage.zip https://go.microsoft.com/fwlink/?linkid=2113331 \ + && unzip -qq sqlpackage.zip -d /opt/sqlpackage \ + && chmod +x /opt/sqlpackage/sqlpackage + && rm /tmp/sqlpackage.zip + +# Add mssql-tools and sqlpackage paths +RUN echo 'export PATH="$PATH:/opt/mssql-tools/bin:/opt/sqlpackage"' >> ~/.bashrc RUN /bin/bash -c "source ~/.bashrc" From ffd877c66e6303462e48b88e6954ff3be96ec0b0 Mon Sep 17 00:00:00 2001 From: "Michael J. Ryan" Date: Wed, 13 Jan 2021 18:53:22 -0700 Subject: [PATCH 2/2] Update Dockerfile Fix changes related to PR comments --- linux/mssql-tools/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux/mssql-tools/Dockerfile b/linux/mssql-tools/Dockerfile index 49d0dce5..e9abbdef 100644 --- a/linux/mssql-tools/Dockerfile +++ b/linux/mssql-tools/Dockerfile @@ -17,8 +17,8 @@ RUN apt-get update && ACCEPT_EULA=Y apt-get install -y msodbcsql mssql-tools # Install SQLPackage for Linux and make it executable RUN wget -O /tmp/sqlpackage.zip https://go.microsoft.com/fwlink/?linkid=2113331 \ - && unzip -qq sqlpackage.zip -d /opt/sqlpackage \ - && chmod +x /opt/sqlpackage/sqlpackage + && unzip -qq /tmp/sqlpackage.zip -d /opt/sqlpackage \ + && chmod +x /opt/sqlpackage/sqlpackage \ && rm /tmp/sqlpackage.zip # Add mssql-tools and sqlpackage paths