Skip to content

Commit 1850eae

Browse files
committed
Fix kayobe user id usage
1 parent d610d12 commit 1850eae

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

docker/kayobe/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ RUN python3 -m pip install docker six
5858
ENV KAYOBE_USER=stack
5959
ARG KAYOBE_USER_UID=1000
6060
ARG KAYOBE_USER_GID=1000
61-
6261
RUN groupadd -g $KAYOBE_USER_GID -o stack && \
6362
useradd -u $KAYOBE_USER_UID -g $KAYOBE_USER_GID \
6463
-G wheel -m -d /stack \
@@ -87,7 +86,8 @@ RUN chmod 600 /stack/.ssh/config
8786
COPY .automation/utils/kayobe-automation-activate .automation.conf/docker*/kayobe/bin/* /usr/local/bin/
8887

8988
# Control host bootsrap without leaving kayobe-config in the image
90-
RUN --mount=type=ssh,uid=1000 --mount=type=tmpfs,target=/tmp/src --mount=type=bind,source=.,target=/src sudo cp -rfp /src /tmp/ && \
89+
ARG KAYOBE_USER_UID=1000
90+
RUN --mount=type=ssh,uid=$KAYOBE_USER_UID --mount=type=tmpfs,target=/tmp/src --mount=type=bind,source=.,target=/src sudo cp -rfp /src /tmp/ && \
9191
sudo chown -Rf stack:stack /tmp/src && \
9292
# Strip the secrets so that we don't need to pass in a vault-password
9393
grep -lR "\$ANSIBLE_VAULT" /tmp/src | xargs rm -f && \

0 commit comments

Comments
 (0)