@@ -16,23 +16,21 @@ RUN apt-get -qqq update \
16
16
dos2unix \
17
17
&& locale-gen "en_US.UTF-8" \
18
18
\
19
- && export ` grep "VERSION_ID" /etc/os-release | sed -e 's/^VERSION_ID=\" /VERSION_ID=/' -e 's/\" $//' ` \
19
+ && export $( grep "VERSION_ID" /etc/os-release | sed -e 's/^VERSION_ID=\" /VERSION_ID=/' -e 's/\" $//' ) \
20
20
&& mkdir -p /usr/share/keyrings \
21
- && curl --fail https://packages.microsoft.com/config/ubuntu/$VERSION_ID/prod.list \
22
- -o /tmp/microsoft-prod.list | \
23
- if ! grep -q "signed-by=" /tmp/microsoft-prod.list; then \
24
- sed -E 's#deb\s +\[ #deb [signed-by=/usr/share/keyrings/microsoft-prod.gpg #; t; q1' | \
25
- fi \
26
- && mv /tmp/microsoft-prod.list /etc/apt/sources.list.d/microsoft.list \
27
- && cat /etc/apt/sources.list.d/microsoft.list \
28
- && curl --fail https://packages.microsoft.com/keys/microsoft.asc | \
29
- gpg --verbose --yes --no-tty --batch --dearmor -o /usr/share/keyrings/microsoft-prod.gpg \
21
+ && curl --fail --show-error https://packages.microsoft.com/config/ubuntu/$VERSION_ID/prod.list -o /tmp/microsoft-prod.list \
22
+ && if ! grep -q "signed-by=" /tmp/microsoft-prod.list; then \
23
+ sed -E 's#deb\s +\[ #deb [signed-by=/usr/share/keyrings/microsoft-prod.gpg #; t; q1' /tmp/microsoft-prod.list > /etc/apt/sources.list.d/microsoft.list; \
24
+ else \
25
+ mv /tmp/microsoft-prod.list /etc/apt/sources.list.d/microsoft.list; \
26
+ fi \
27
+ && curl --fail --show-error https://packages.microsoft.com/keys/microsoft.asc | \
28
+ gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg \
30
29
\
31
30
&& apt-get -qqq update \
32
- && ACCEPT_EULA=Y apt-get install -y mssql-tools$MSSQLTOOLS_SUFFIX=$MSSQLTOOLS_VERSION unixodbc-dev \
33
- && apt-get remove -y curl apt-transport-https gnupg2 \
34
- && rm -f /etc/apt/sources.list.d/msprod.list \
35
- && rm -rf /var/lib/apt/lists/*
31
+ && ACCEPT_EULA=Y apt-get install -y --no-install-recommends mssql-tools$MSSQLTOOLS_SUFFIX=$MSSQLTOOLS_VERSION unixodbc-dev \
32
+ && apt-get autoremove -y && apt-get clean \
33
+ && rm -rf /tmp/* /var/lib/apt/lists/*
36
34
37
35
# # should be set after locale was generated, overwise triggers warnings
38
36
ENV LANG="en_US.UTF-8" LANGUAGE="en_US.UTF-8" LC_ALL="en_US.UTF-8"
0 commit comments