Skip to content

Commit 813d28b

Browse files
authored
Merge pull request #1115 from minrk/set-user-root
set USER root after each directive block
2 parents 3f07830 + 945c452 commit 813d28b

File tree

5 files changed

+13
-0
lines changed

5 files changed

+13
-0
lines changed

repo2docker/buildpacks/base.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@
100100
{% for sd in build_script_directives -%}
101101
{{ sd }}
102102
{% endfor %}
103+
# ensure root user after build scripts
104+
USER root
103105
104106
# Allow target path repo is cloned to be configurable
105107
ARG REPO_DIR=${HOME}
@@ -138,6 +140,8 @@
138140
{% for sd in preassemble_script_directives -%}
139141
{{ sd }}
140142
{% endfor %}
143+
# ensure root user after preassemble scripts
144+
USER root
141145
142146
# Copy stuff.
143147
COPY --chown={{ user }}:{{ user }} src/ ${REPO_DIR}

tests/r/apt/apt.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libsodium-dev

tests/r/apt/install.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
install.packages("viridisLite")

tests/r/apt/runtime.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
r-4.1-2021-10-22

tests/r/apt/verify

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
apt list
4+
apt list | grep libsodium-dev
5+
# make sure we got R
6+
which R

0 commit comments

Comments
 (0)