Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
clemlesne committed Apr 4, 2023
2 parents c04065e + 7e55128 commit baffdba
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 36 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
[Azure Pipelines Agent](https://github.com/clemlesne/azure-pipelines-agent) is self-hosted agent in Kubernetes, cheap to run, secure, auto-scaled and easy to deploy.

<!-- github.com badges -->
![GitHub Release Date](https://img.shields.io/github/release-date/clemlesne/azure-pipelines-agent)
![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/clemlesne/azure-pipelines-agent/pipeline.yaml?branch=main)
[![GitHub Release Date](https://img.shields.io/github/release-date/clemlesne/azure-pipelines-agent)](https://github.com/clemlesne/azure-pipelines-agent/releases)
[![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/clemlesne/azure-pipelines-agent/pipeline.yaml?branch=main)](https://github.com/clemlesne/azure-pipelines-agent/actions/workflows/pipeline.yaml)
[![GitHub all releases](https://img.shields.io/github/downloads/clemlesne/azure-pipelines-agent/total)](https://github.com/clemlesne/azure-pipelines-agent/pkgs/container/azure-pipelines-agent)

<!-- artifacthub.io badges -->
[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/azure-pipelines-agent)](https://artifacthub.io/packages/search?repo=azure-pipelines-agent)
Expand Down Expand Up @@ -59,11 +60,10 @@ helm upgrade --install agent clemlesne-azure-pipelines-agent/azure-pipelines-age

### Provided software

- [Azure Pipelines agent](https://github.com/microsoft/azure-pipelines-agent), see env var `AGENT_VERSION` on the container images
- [Azure Pipelines system requirements](https://learn.microsoft.com/en-us/azure/devops/pipelines/agents/docker?view=azure-devops#linux)
- [Azure Pipelines agent](https://github.com/microsoft/azure-pipelines-agent) (see env var `AGENT_VERSION` on the container images) + [requirements](https://learn.microsoft.com/en-us/azure/devops/pipelines/agents/docker?view=azure-devops#linux)
- [ASP.NET Core](https://github.com/dotnet/aspnetcore) runtime (required by the Azure Pipelines agent)
- [Azure CLI](https://github.com/Azure/azure-cli) (required by the Azure Pipelines agent)
- "make, tar, unzip, gzip, zip, zstd" (for developer ease-of-life)
- [Azure CLI](https://github.com/Azure/azure-cli) (required by the Azure Pipelines agent) + requirements ([Python 3.8](https://www.python.org/downloads/release/python-380), [Python 3.9](https://www.python.org/downloads/release/python-390), [Python 3.10](https://www.python.org/downloads/release/python-3100), depending of the system, plus C/Rust build tools for libs non pre-built on the platforms)
- "tar, unzip, gzip, zip, zsh, zstd" (for developer ease-of-life)

### Helm values

Expand Down
23 changes: 17 additions & 6 deletions src/docker/Dockerfile-bullseye
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim
# Fetch the vendor with the builder platform to avoid QEMU issues
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim

ENV DEBIAN_FRONTEND=noninteractive

Expand All @@ -7,26 +8,36 @@ RUN apt-get upgrade -y -q --no-install-recommends

# Install:
# - Azure Pipelines agent system requirements
# - "make, tar, unzip, gzip, zip, zstd" for developer ease-of-life
# - Azure CLI system requirements (Python 3.9, plus C/Rust build tools for libs non pre-built on this platform)
# - "tar, unzip, gzip, zip, zsh, zstd" for developer ease-of-life
RUN apt-get install -y -q --no-install-recommends \
apt-transport-https \
apt-utils \
build-essential \
ca-certificates \
cargo \
curl \
git \
gzip \
iputils-ping \
jq \
libffi-dev \
libssl-dev \
lsb-release \
make \
pkg-config \
python3-dev=3.9.* \
python3-pip \
python3=3.9.* \
software-properties-common \
tar \
unzip \
zip \
zsh \
zstd

# Install Azure CLI
RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash
RUN python3 -m pip install --no-cache-dir --upgrade pip \
&& python3 -m pip install --no-cache-dir setuptools wheel \
&& python3 -m pip install --no-cache-dir azure-cli \
&& az --version

WORKDIR /azp

Expand Down
23 changes: 17 additions & 6 deletions src/docker/Dockerfile-focal
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal
# Fetch the vendor with the builder platform to avoid QEMU issues
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:6.0-focal

ENV DEBIAN_FRONTEND=noninteractive

Expand All @@ -7,26 +8,36 @@ RUN apt-get upgrade -y -q --no-install-recommends

# Install:
# - Azure Pipelines agent system requirements
# - "make, tar, unzip, gzip, zip, zstd" for developer ease-of-life
# - Azure CLI system requirements (Python 3.8, plus C/Rust build tools for libs non pre-built on this platform)
# - "tar, unzip, gzip, zip, zsh, zstd" for developer ease-of-life
RUN apt-get install -y -q --no-install-recommends \
apt-transport-https \
apt-utils \
build-essential \
ca-certificates \
cargo \
curl \
git \
gzip \
iputils-ping \
jq \
libffi-dev \
libssl-dev \
lsb-release \
make \
pkg-config \
python3-dev=3.8.* \
python3-pip \
python3=3.8.* \
software-properties-common \
tar \
unzip \
zip \
zsh \
zstd

# Install Azure CLI
RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash
RUN python3 -m pip install --no-cache-dir --upgrade pip \
&& python3 -m pip install --no-cache-dir setuptools wheel \
&& python3 -m pip install --no-cache-dir azure-cli \
&& az --version

WORKDIR /azp

Expand Down
23 changes: 17 additions & 6 deletions src/docker/Dockerfile-jammy
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0-jammy
# Fetch the vendor with the builder platform to avoid QEMU issues
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:6.0-jammy

ENV DEBIAN_FRONTEND=noninteractive

Expand All @@ -7,26 +8,36 @@ RUN apt-get upgrade -y -q --no-install-recommends

# Install:
# - Azure Pipelines agent system requirements
# - "make, tar, unzip, gzip, zip, zstd" for developer ease-of-life
# - Azure CLI system requirements (Python 3.10, plus C/Rust build tools for libs non pre-built on this platform)
# - "tar, unzip, gzip, zip, zsh, zstd" for developer ease-of-life
RUN apt-get install -y -q --no-install-recommends \
apt-transport-https \
apt-utils \
build-essential \
ca-certificates \
cargo \
curl \
git \
gzip \
iputils-ping \
jq \
libffi-dev \
libssl-dev \
lsb-release \
make \
pkg-config \
python3-dev=3.10.* \
python3-pip \
python3=3.10.* \
software-properties-common \
tar \
unzip \
zip \
zsh \
zstd

# Install Azure CLI
RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash
RUN python3 -m pip install --no-cache-dir --upgrade pip \
&& python3 -m pip install --no-cache-dir setuptools wheel \
&& python3 -m pip install --no-cache-dir azure-cli \
&& az --version

WORKDIR /azp

Expand Down
32 changes: 20 additions & 12 deletions src/docker/Dockerfile-ubi8
Original file line number Diff line number Diff line change
@@ -1,32 +1,40 @@
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7
# Fetch the vendor with the builder platform to avoid QEMU issues
FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi8/ubi-minimal:8.7

RUN microdnf upgrade -y --setopt=install_weak_deps=0

# Install:
# - Azure Pipelines agent system requirements
# - Azure CLI system requirements (Python 3.9, plus C/Rust build tools for libs non pre-built on this platform)
# - ASP.NET Core runtime
# - "make, tar, unzip, gzip, zip, zstd" for developer ease-of-life
RUN microdnf install -y --setopt=install_weak_deps=0 \
# - "tar, unzip, gzip, zip, zsh, zstd" for developer ease-of-life
RUN microdnf install -y --nodocs --setopt=install_weak_deps=0 \
aspnetcore-runtime-6.0 \
autoconf \
automake \
binutils \
ca-certificates \
cargo \
curl \
gcc \
gcc-c++ \
gzip \
hostname \
iputils \
make \
perl-generators \
openssl-devel \
pkg-config \
python39 \
python39-devel \
python39-pip \
tar \
unzip \
yum-utils \
zip \
zsh \
zstd

# Install Azure CLI
RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc \
&& dnf install -y https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm
RUN microdnf install -y --setopt=install_weak_deps=0 \
azure-cli
RUN python3 -m pip install --no-cache-dir --upgrade pip \
&& python3 -m pip install --no-cache-dir setuptools wheel \
&& python3 -m pip install --no-cache-dir azure-cli \
&& az --version

WORKDIR /azp

Expand Down

0 comments on commit baffdba

Please sign in to comment.