Skip to content

Commit 02f344c

Browse files
authored
Update Dockerfile
1 parent e11feeb commit 02f344c

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

ubuntu/Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,16 @@ RUN apt-get -qqq update \
1717
&& locale-gen "en_US.UTF-8" \
1818
\
1919
&& export `grep "VERSION_ID" /etc/os-release | sed -e 's/^VERSION_ID=\"/VERSION_ID=/' -e 's/\"$//'` \
20-
&& mkdir -p /etc/apt/keyrings/ \
21-
&& curl --fail https://packages.microsoft.com/config/ubuntu/$VERSION_ID/prod.list | \
22-
sed -E 's#deb\s+\[#deb [signed-by=/etc/apt/keyrings/microsoft.gpg #; t; q1' | \
23-
tee /etc/apt/sources.list.d/microsoft.list \
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 \
2428
&& curl --fail https://packages.microsoft.com/keys/microsoft.asc | \
25-
gpg --verbose --yes --no-tty --batch --dearmor -o /etc/apt/keyrings/microsoft.gpg \
29+
gpg --verbose --yes --no-tty --batch --dearmor -o /usr/share/keyrings/microsoft-prod.gpg \
2630
\
2731
&& apt-get -qqq update \
2832
&& ACCEPT_EULA=Y apt-get install -y mssql-tools$MSSQLTOOLS_SUFFIX=$MSSQLTOOLS_VERSION unixodbc-dev \

0 commit comments

Comments
 (0)