Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add package upgrade logic to debian Dockerfiles and misc format cleanup #1242

Merged
merged 4 commits into from
Nov 1, 2024
Merged

Add package upgrade logic to debian Dockerfiles and misc format cleanup #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb5b3fb
Add package upgrade logic to debian Dockerfiles and misc format cleanup
MichaelSimons Oct 31, 2024
6a762dc
Update Dockerfile
MichaelSimons Nov 1, 2024
42d0a68
Update Dockerfile
MichaelSimons Nov 1, 2024
71620ab
Merge branch 'main' into debian-pkg-upgrade
MichaelSimons Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 46 additions & 50 deletions src/debian/11/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,53 @@ FROM library/debian:bullseye
# Dependencies for generic .NET Core builds and the base toolchain we need to
# build anything (clang, cmake, make and the like)
RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y \
autoconf \
automake \
azure-cli \
build-essential \
clang \
cmake \
curl \
elfutils \
file \
g++ \
gettext \
gdb \
git \
gnupg \
jq \
libcurl4-openssl-dev \
libgdiplus \
libicu-dev \
libkrb5-dev \
liblldb-dev \
liblttng-ust-dev \
libnuma-dev \
libssl-dev \
libssl1.1 \
libtool \
libunwind8-dev \
lldb \
llvm \
locales \
make \
pigz \
python-lldb \
sudo \
tar \
uuid-dev \
zip \
zlib1g-dev \
apt-transport-https \
curl \
software-properties-common \
&& curl -sL https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -o packages-microsoft-prod.deb \
&& dpkg -i packages-microsoft-prod.deb \
&& rm packages-microsoft-prod.deb \
&& apt-get update \
&& apt-get install -y \
autoconf \
automake \
azure-cli \
build-essential \
clang \
cmake \
elfutils \
file \
g++ \
gettext \
gdb \
git \
gnupg \
jq \
libcurl4-openssl-dev \
libgdiplus \
libicu-dev \
libkrb5-dev \
liblldb-dev \
liblttng-ust-dev \
libnuma-dev \
libssl-dev \
libssl1.1 \
libtool \
libunwind8-dev \
lldb \
llvm \
locales \
make \
pigz \
powershell \
python-lldb \
sudo \
tar \
uuid-dev \
zip \
zlib1g-dev \
&& rm -rf /var/lib/apt/lists/*

# .NET SDK MSBuild requires US.UTF-8 locale to execute tasks
Expand All @@ -49,16 +58,3 @@ RUN echo "locales locales/default_environment_locale select en_US.UTF-8" | debco
&& echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8" | debconf-set-selections \
&& rm "/etc/locale.gen" \
&& dpkg-reconfigure --frontend noninteractive locales

# Install powershell.
RUN apt-get update && \
apt-get install -y \
apt-transport-https \
software-properties-common \
curl && \
curl -sL https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -o packages-microsoft-prod.deb && \
dpkg -i packages-microsoft-prod.deb && \
rm packages-microsoft-prod.deb && \
apt-get update && \
apt-get install -y powershell && \
rm -rf /var/lib/apt/lists/*
38 changes: 18 additions & 20 deletions src/debian/11/helix/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,21 @@ FROM library/debian:bullseye

# Install Helix Dependencies

RUN apt-get update && \
apt-get install -y \
RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y \
apt-transport-https \
curl \
software-properties-common \
&& curl -sL https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -o packages-microsoft-prod.deb \
&& dpkg -i packages-microsoft-prod.deb \
&& rm packages-microsoft-prod.deb \
&& apt-get update \
&& apt-get install -y \
autoconf \
automake \
at \
build-essential \
curl \
gcc \
gdb \
git \
Expand All @@ -17,6 +25,7 @@ RUN apt-get update && \
libffi-dev \
libgdiplus \
libicu-dev \
libmsquic \
libssl-dev \
libtool \
libunwind8 \
Expand All @@ -26,7 +35,6 @@ RUN apt-get update && \
python3-dev \
python3-pip \
python3-venv \
software-properties-common \
sudo \
tzdata \
unzip \
Expand All @@ -35,25 +43,15 @@ RUN apt-get update && \

ENV LANG=en_US.utf8

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
RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
echo 2cfd20a306b2fa5e25522d78f2ef50a1f429d35fd30bd983e2ebffc2b80944fa microsoft.asc| sha256sum --check - && \
apt-key add microsoft.asc && \
rm 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/*
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

# 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 && \
chmod 755 /root && \
echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bash --ingroup adm helixbot \
&& chmod 755 /root \
&& echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers

USER helixbot

Expand Down
45 changes: 21 additions & 24 deletions src/debian/11/helix/arm32v7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,21 @@ ENV _PYTHON_HOST_PLATFORM=linux_armv7l

# Install Helix Dependencies

RUN apt-get update && \
apt-get install -y \
RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y \
apt-transport-https \
curl \
software-properties-common \
&& curl -sL https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -o packages-microsoft-prod.deb \
&& dpkg -i packages-microsoft-prod.deb \
&& rm packages-microsoft-prod.deb \
&& apt-get update \
&& apt-get install -y \
autoconf \
automake \
at \
build-essential \
curl \
gcc \
gdb \
git \
Expand All @@ -20,6 +28,7 @@ RUN apt-get update && \
libffi-dev \
libgdiplus \
libicu-dev \
libmsquic \
libssl-dev \
libtool \
libunwind8 \
Expand All @@ -30,39 +39,27 @@ RUN apt-get update && \
python3-dev \
python3-pip \
python3-venv \
software-properties-common \
sudo \
tzdata \
unzip \
&& rm -rf /var/lib/apt/lists/* \
\
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8

# Add MsQuic
RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
echo 2cfd20a306b2fa5e25522d78f2ef50a1f429d35fd30bd983e2ebffc2b80944fa microsoft.asc| sha256sum --check - && \
apt-key add microsoft.asc && \
rm 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/*

ENV LANG=en_US.utf8

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 && \
export CRYPTOGRAPHY_DONT_BUILD_RUST=1 && \
pip install ./helix_scripts-*-py3-none-any.whl
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 \
&& export CRYPTOGRAPHY_DONT_BUILD_RUST=1 \
&& pip install ./helix_scripts-*-py3-none-any.whl

# Create helixbot user and give rights to sudo without password
# (we use two users here to ensure volume mounting works with two possible UIDs of the host UID)
# additionally, preinstall the virtualenv packages used for VSTS reporting to save time
RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1001 --shell /bin/bash --ingroup adm helixbot && \
/usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bash --ingroup adm helixbot2 && \
chmod 755 /root && \
echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers && \
echo "helixbot2 ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1001 --shell /bin/bash --ingroup adm helixbot \
&& /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bash --ingroup adm helixbot2 \
&& chmod 755 /root \
&& echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers \
&& echo "helixbot2 ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers

USER helixbot

Expand Down
45 changes: 21 additions & 24 deletions src/debian/11/helix/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,22 @@ FROM library/debian:bullseye

# Install Helix Dependencies

RUN apt-get update && \
apt-get install -y \
RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y \
apt-transport-https \
curl \
software-properties-common \
&& curl -sL https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -o packages-microsoft-prod.deb \
&& dpkg -i packages-microsoft-prod.deb \
&& rm packages-microsoft-prod.deb \
&& apt-get update \
&& apt-get install -y \
autoconf \
automake \
at \
build-essential \
cmake \
curl \
gcc \
gdb \
git \
Expand All @@ -18,6 +26,7 @@ RUN apt-get update && \
libffi-dev \
libgdiplus \
libicu-dev \
libmsquic \
libssl-dev \
libtool \
libunwind8 \
Expand All @@ -27,39 +36,27 @@ RUN apt-get update && \
python3-dev \
python3-pip \
python3-venv \
software-properties-common \
sudo \
tzdata \
unzip \
&& rm -rf /var/lib/apt/lists/* \
\
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8

ENV LANG=en_US.utf8

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 && \
export CRYPTOGRAPHY_DONT_BUILD_RUST=1 && \
pip install ./helix_scripts-*-py3-none-any.whl

# Add MsQuic
RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
echo 2cfd20a306b2fa5e25522d78f2ef50a1f429d35fd30bd983e2ebffc2b80944fa microsoft.asc| sha256sum --check - && \
apt-key add microsoft.asc && \
rm 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/*
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 \
&& export CRYPTOGRAPHY_DONT_BUILD_RUST=1 \
&& pip install ./helix_scripts-*-py3-none-any.whl

# Create helixbot users and give rights to sudo without password
# (we use two users here to ensure volume mounting works with two possible UIDs of the host UID)
# additionally, preinstall the virtualenv packages used for VSTS reporting to save time
RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1001 --shell /bin/bash --ingroup adm helixbot && \
/usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bash --ingroup adm helixbot2 && \
chmod 755 /root && \
echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers && \
echo "helixbot2 ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1001 --shell /bin/bash --ingroup adm helixbot \
&& /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bash --ingroup adm helixbot2 \
&& chmod 755 /root \
&& echo "helixbot ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers \
&& echo "helixbot2 ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers

USER helixbot

Expand Down
Loading