Skip to content

Commit 18dc57b

Browse files
authored
Run webassets build in Docker as current OS user (#20453)
Backport #20426 to branch/v12
1 parent 077a8f4 commit 18dc57b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

build.assets/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,10 @@ teleterm: buildbox-teleterm
248248
docker run $(DOCKERFLAGS) $(NOROOT) $(BUILDBOX_TELETERM) \
249249
bash -c "cd $(SRCDIR) && export CONNECT_TSH_BIN_PATH=\$$PWD/../teleport/build/tsh && yarn install --frozen-lockfile && yarn build-term && yarn package-term -c.extraMetadata.version=$(CONNECT_VERSION)"
250250

251+
# Builds webassets inside Docker.
251252
.PHONY:ui
252253
ui: buildbox
253-
docker run -v "$$(pwd)/../":/teleport $(BUILDBOX) \
254+
docker run -u $(UID):$(GID) -v "$$(pwd)/../":/teleport $(BUILDBOX) \
254255
bash -c "cd ../teleport && yarn install --frozen-lockfile && yarn build-ui"
255256

256257
# grpc generates GRPC stubs from inside the buildbox

0 commit comments

Comments
 (0)