Skip to content

Remove ubuntu user from WAML image #13

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

Merged
ianpittwood merged 3 commits into from
May 7, 2026
Merged

Remove ubuntu user from WAML image #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b161548
Remove `ubuntu` builtin user from WAML image to free up 1000 uid
ianpittwood May 7, 2026
f8fc4ed
Add `-eu` to SHELL delcarations
ianpittwood May 7, 2026
1699a3b
Add checks for nginx configs in WAML image
ianpittwood May 7, 2026
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
9 changes: 8 additions & 1 deletion workbench-for-microsoft-azure-ml/2026.04/Containerfile.ubuntu2404.min
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ ENV DIAGNOSTIC_ONLY=false

COPY --chmod=0644 workbench-for-microsoft-azure-ml/2026.04/conf/license-manager/TurboActivate.dat /opt/rstudio-license/license-manager.conf

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

### Remove ubuntu user ###
# Ubuntu 24.04 assigns the uid 1000 to the ubuntu user. This is incompatible with the hardcoded PUID=1000 environment
# variable set by Azure ML. By removing the ubuntu user, we can free up the 1000 uid entirely.
RUN userdel -r ubuntu

### Setup environment ###
RUN apt-get update -yqq --fix-missing && \
Expand Down Expand Up @@ -98,6 +103,8 @@ CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]

FROM build AS clamav

SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

# Set up ClamAV
RUN apt-get update -yqq && \
apt-get install -yqq --no-install-recommends \
Expand Down
9 changes: 8 additions & 1 deletion workbench-for-microsoft-azure-ml/2026.04/Containerfile.ubuntu2404.std
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ ENV DIAGNOSTIC_ONLY=false

COPY --chmod=0644 workbench-for-microsoft-azure-ml/2026.04/conf/license-manager/TurboActivate.dat /opt/rstudio-license/license-manager.conf

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

### Remove ubuntu user ###
# Ubuntu 24.04 assigns the uid 1000 to the ubuntu user. This is incompatible with the hardcoded PUID=1000 environment
# variable set by Azure ML. By removing the ubuntu user, we can free up the 1000 uid entirely.
RUN userdel -r ubuntu

### Setup environment ###
RUN apt-get update -yqq --fix-missing && \
Expand Down Expand Up @@ -151,6 +156,8 @@ CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]

FROM build AS clamav

SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

# Set up ClamAV
RUN apt-get update -yqq && \
apt-get install -yqq --no-install-recommends \
Expand Down
8 changes: 8 additions & 0 deletions workbench-for-microsoft-azure-ml/2026.04/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,14 @@ file:
{{ end }}


# Check that Nginx configs are included
/etc/rstudio/nginx.site.conf:
exists: true
/etc/rstudio/nginx.server.conf:
exists: true
/etc/rstudio/nginx.http.conf:
exists: true

command:
"Ensure rstudio-server has permissions to log directory":
exec: su rstudio-server -c 'touch /var/lib/rstudio-server/monitor/log/rstudio-server.log'
Expand Down
9 changes: 8 additions & 1 deletion workbench-for-microsoft-azure-ml/template/Containerfile.ubuntu2404.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ ENV DIAGNOSTIC_ONLY=false

COPY --chmod=0644 {{ Path.Version }}/conf/license-manager/TurboActivate.dat /opt/rstudio-license/license-manager.conf

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

### Remove ubuntu user ###
# Ubuntu 24.04 assigns the uid 1000 to the ubuntu user. This is incompatible with the hardcoded PUID=1000 environment
# variable set by Azure ML. By removing the ubuntu user, we can free up the 1000 uid entirely.
RUN userdel -r ubuntu

### Setup environment ###
{{ apt.run_setup() }}
Expand Down Expand Up @@ -132,6 +137,8 @@ CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]

FROM build AS clamav

SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

# Set up ClamAV
{{ apt.run_install("clamav") }}

Expand Down
8 changes: 8 additions & 0 deletions workbench-for-microsoft-azure-ml/template/test/goss.yaml.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,14 @@ file:
{{ end }}
{% endraw %}

# Check that Nginx configs are included
/etc/rstudio/nginx.site.conf:
exists: true
/etc/rstudio/nginx.server.conf:
exists: true
/etc/rstudio/nginx.http.conf:
exists: true

command:
"Ensure rstudio-server has permissions to log directory":
exec: su rstudio-server -c 'touch /var/lib/rstudio-server/monitor/log/rstudio-server.log'
Expand Down
Loading