Skip to content

Commit 97e1951

Browse files
jakulehatched
authored andcommitted
Run webassets build in Docker as current OS user (#20426)
Set the current user when running webassets builds. In this way, the build artifacts will have correct permissions.
1 parent 582a796 commit 97e1951

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
@@ -237,9 +237,10 @@ teleterm: buildbox-teleterm
237237
docker run $(DOCKERFLAGS) $(NOROOT) $(BUILDBOX_TELETERM) \
238238
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)"
239239

240+
# Builds webassets inside Docker.
240241
.PHONY:ui
241242
ui: buildbox
242-
docker run -v "$$(pwd)/../":/teleport $(BUILDBOX) \
243+
docker run -u $(UID):$(GID) -v "$$(pwd)/../":/teleport $(BUILDBOX) \
243244
bash -c "cd ../teleport && yarn install --frozen-lockfile && yarn build-ui"
244245

245246
# grpc generates GRPC stubs from inside the buildbox

0 commit comments

Comments
 (0)