diff --git a/src/debian/10/helix/amd64/Dockerfile b/src/debian/10/helix/amd64/Dockerfile index b2f821346..d7608e5ab 100644 --- a/src/debian/10/helix/amd64/Dockerfile +++ b/src/debian/10/helix/amd64/Dockerfile @@ -25,6 +25,7 @@ RUN apt-get update && \ procps \ python3-dev \ python3-pip \ + software-properties-common \ sudo \ tzdata \ unzip \ @@ -41,6 +42,15 @@ RUN ln -sf /usr/bin/python3 /usr/bin/python && \ pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ pip install ./helix_scripts-*-py3-none-any.whl +# Add MsQuic +COPY microsoft.asc /tmp +RUN apt-key add /tmp/microsoft.asc \ + && rm /tmp/microsoft.asc \ + && apt-add-repository https://packages.microsoft.com/debian/10/prod \ + && apt-get update \ + && apt-get install -y libmsquic \ + && rm -rf /var/lib/apt/lists/* + # Create helixbot user and give rights to sudo without password # additionally, preinstall the virtualenv packages used for VSTS reporting to save time RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bash --ingroup adm helixbot && \ @@ -49,4 +59,4 @@ RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bas USER helixbot -RUN python -m virtualenv --no-site-packages /home/helixbot/.vsts-env \ No newline at end of file +RUN python -m virtualenv --no-site-packages /home/helixbot/.vsts-env diff --git a/src/debian/10/helix/amd64/microsoft.asc b/src/debian/10/helix/amd64/microsoft.asc new file mode 100644 index 000000000..6e319d453 --- /dev/null +++ b/src/debian/10/helix/amd64/microsoft.asc @@ -0,0 +1,19 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.7 (GNU/Linux) + +mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT +LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV +7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag +OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j +H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr +M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs +ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC +AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH +/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe +MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy +7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV +KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ +XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+ +NdCFTW7wY0Fb1fWJ+/KTsC4= +=J6gs +-----END PGP PUBLIC KEY BLOCK----- diff --git a/src/debian/11/helix/amd64/Dockerfile b/src/debian/11/helix/amd64/Dockerfile index 0c9191f02..f89709820 100644 --- a/src/debian/11/helix/amd64/Dockerfile +++ b/src/debian/11/helix/amd64/Dockerfile @@ -24,6 +24,7 @@ RUN apt-get update && \ locales-all \ python3-dev \ python3-pip \ + software-properties-common \ sudo \ tzdata \ unzip \ @@ -40,6 +41,15 @@ RUN ln -sf /usr/bin/python3 /usr/bin/python && \ pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \ pip install ./helix_scripts-*-py3-none-any.whl +# Add MsQuic +COPY microsoft.asc /tmp +RUN apt-key add /tmp/microsoft.asc \ + && rm /tmp/microsoft.asc \ + && apt-add-repository https://packages.microsoft.com/debian/11/prod \ + && apt-get update \ + && apt-get install -y libmsquic \ + && rm -rf /var/lib/apt/lists/* + # Create helixbot user and give rights to sudo without password # additionally, preinstall the virtualenv packages used for VSTS reporting to save time RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bash --ingroup adm helixbot && \ @@ -48,4 +58,4 @@ RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bas USER helixbot -RUN python -m virtualenv --no-site-packages /home/helixbot/.vsts-env \ No newline at end of file +RUN python -m virtualenv --no-site-packages /home/helixbot/.vsts-env diff --git a/src/debian/11/helix/amd64/microsoft.asc b/src/debian/11/helix/amd64/microsoft.asc new file mode 100644 index 000000000..6e319d453 --- /dev/null +++ b/src/debian/11/helix/amd64/microsoft.asc @@ -0,0 +1,19 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.7 (GNU/Linux) + +mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT +LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV +7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag +OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j +H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr +M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs +ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC +AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH +/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe +MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy +7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV +KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ +XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+ +NdCFTW7wY0Fb1fWJ+/KTsC4= +=J6gs +-----END PGP PUBLIC KEY BLOCK-----