Skip to content

Commit c7611fe

Browse files
authored
docker/debian: Use USER_UID (not BUILD_UID) for current consistency (envoyproxy#452)
Signed-off-by: Ryan Northey <ryan@synca.io>
1 parent 98c3db7 commit c7611fe

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docker/linux/debian/docker-entrypoint.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
set -e -o pipefail
44

55

6-
if [[ -z "${BUILD_UID}" ]]; then
7-
echo "BUILD_UID must be set" >&2
6+
if [[ -z "${USER_UID}" ]]; then
7+
echo "USER_UID must be set" >&2
88
fi
99

1010
start_docker () {
@@ -26,7 +26,7 @@ get_docker_info () {
2626

2727
set_user_permissions () {
2828
mkdir -p /home/envoybuild/.docker
29-
usermod -u "${BUILD_UID}" envoybuild &> /dev/null
29+
usermod -u "${USER_UID}" envoybuild &> /dev/null
3030
chown envoybuild:envoybuild /home/envoybuild
3131
if [[ -e /home/envoybuild/.cache ]]; then
3232
chown envoybuild:envoybuild /home/envoybuild/.cache

docker/linux/debian/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e -o pipefail
44

5-
usermod -u "${BUILD_UID}" envoybuild &> /dev/null
5+
usermod -u "${USER_UID}" envoybuild &> /dev/null
66
chown envoybuild:envoybuild /home/envoybuild
77
if [[ -e /home/envoybuild/.cache ]]; then
88
chown envoybuild:envoybuild /home/envoybuild/.cache

docker/linux/debian/llvm-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e -o pipefail
44

5-
usermod -u "${BUILD_UID}" envoybuild &> /dev/null
5+
usermod -u "${USER_UID}" envoybuild &> /dev/null
66
chown envoybuild:envoybuild /home/envoybuild
77
export PATH="/opt/llvm/bin:${PATH}"
88
if [[ -e /home/envoybuild/.cache ]]; then

0 commit comments

Comments
 (0)