Skip to content

Commit 2c8c5ef

Browse files
authored
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
1 parent 057832d commit 2c8c5ef

File tree

2 files changed

+23
-6
lines changed

2 files changed

+23
-6
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

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)