Skip to content

Commit 812d54c

Browse files
authored
Release/v2.1.0 (#28)
* Feature/v2.0.1 add sudo and docker support (#27) * Update Dockerfile to install sudo and adjust ownership commands for azdouser * Add ownership and group management for azdouser in start.sh before checking the command sudo is available * Bump version to 2.1.0 and update Docker image tag to 3.248.0-stable-v2.1.0 in README and values.yaml
1 parent 057832d commit 812d54c

File tree

6 files changed

+42
-9
lines changed

6 files changed

+42
-9
lines changed

Dockerfile

+7-6
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,14 @@ RUN chmod +x start.sh
100100
# Create non-root user under docker group
101101
RUN useradd -m -s /bin/bash -u "1000" azdouser
102102
RUN groupadd docker && usermod -aG docker azdouser
103-
RUN echo "azdouser ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
104-
WORKDIR /home/azdouser
105-
RUN chown -R azdouser /home/azdouser
106-
RUN chown -R azdouser /azp
107-
RUN chown -R azdouser /var/run/docker.sock || true
108-
USER azdouser
103+
RUN apt-get update \
104+
&& apt-get install -y sudo \
105+
&& echo azdouser ALL=\(root\) NOPASSWD:ALL >> /etc/sudoers
109106

107+
RUN sudo chown -R azdouser /home/azdouser
108+
RUN sudo chown -R azdouser /azp
109+
RUN sudo chown -R azdouser /var/run/docker.sock || true
110+
USER azdouser
110111

111112

112113
# cd to /azp and run start.sh

README.md

+8
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,20 @@ The table presented below outlines the correspondence between Helm chart version
1212

1313
| Helm Version | Docker Tag | Agent Version |
1414
|--------------|------------|---------------|
15+
| 2.1.0 | 3.248.0-stable-v2.1.0 | 3.248.0 |
1516
| 2.0.1 | 3.248.0 | 3.248.0 |
1617
| 2.0.0 | 3.232.3 | 3.232.3 |
1718
| 1.0.7 | 2.214.1 | 2.214.1 |
1819

1920
## Important Release Notes
2021

22+
### 2.1.0
23+
24+
This release includes the same agent version but different Docker image tag and **different bash invocations**!
25+
- :white_check_mark: [Add sudo and docker support](https://github.com/btungut/azure-devops-agent-on-kubernetes/pull/27)
26+
27+
28+
2129
### 2.0.1
2230

2331
- :white_check_mark: [duplicate apt install command](https://github.com/btungut/azure-devops-agent-on-kubernetes/issues/16)

chart/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: azure-devops-agent
33
description: Dockerized build agent for Azure DevOps
44
type: application
5-
version: 2.0.1
6-
appVersion: "3.248.0"
5+
version: 2.1.0
6+
appVersion: "3.248.0-stable-v2.1.0"
77
keywords:
88
- azure devops
99
- build agent

chart/README.md

+8
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,20 @@ The table presented below outlines the correspondence between Helm chart version
88

99
| Helm Version | Docker Tag | Agent Version |
1010
|--------------|------------|---------------|
11+
| 2.1.0 | 3.248.0-stable-v2.1.0 | 3.248.0 |
1112
| 2.0.1 | 3.248.0 | 3.248.0 |
1213
| 2.0.0 | 3.232.3 | 3.232.3 |
1314
| 1.0.7 | 2.214.1 | 2.214.1 |
1415

1516
## Important Release Notes
1617

18+
### 2.1.0
19+
20+
This release includes the same agent version but different Docker image tag and **different bash invocations**!
21+
- :white_check_mark: [Add sudo and docker support](https://github.com/btungut/azure-devops-agent-on-kubernetes/pull/27)
22+
23+
24+
1725
### 2.0.1
1826

1927
- :white_check_mark: [duplicate apt install command](https://github.com/btungut/azure-devops-agent-on-kubernetes/issues/16)

chart/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ image:
3131
# registry: docker.io
3232
repository: btungut/azure-devops-agent
3333
pullPolicy: IfNotPresent
34-
tag: "3.248.0"
34+
tag: "3.248.0-stable-v2.1.0"
3535
pullSecrets: []
3636

3737
resources:

src/start.sh

+16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
#!/bin/bash
2+
3+
if [ -x "$(command -v sudo)" ]; then
4+
{
5+
sudo chown -R azdouser /home/azdouser
6+
sudo chown -R azdouser /azp
7+
sudo chown -R azdouser /var/run/docker.sock || true
8+
9+
if [ -S /var/run/docker.sock ]; then
10+
sudo groupadd docker || true
11+
sudo usermod -aG docker azdouser || true
12+
sudo newgrp docker || true
13+
echo "Docker.sock exists and processed!"
14+
fi
15+
} || true
16+
fi
17+
218
set -e
319

420
if [ -z "$AZP_URL" ]; then

0 commit comments

Comments
 (0)