From 1f85417d6044b2c8c347ea8314fb25fcb27368ed Mon Sep 17 00:00:00 2001 From: Jakub Nyckowski Date: Fri, 10 Feb 2023 14:15:54 -0500 Subject: [PATCH] Always include webassets_embed when building teleport (#21601) * Always include webassets_embed when building teleport Currently, all builds should include webassets, so we can just hanrdcode this tag. * Update e --- Makefile | 11 ++++------- e | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 4679604869a..d47a18f6964 100644 --- a/Makefile +++ b/Makefile @@ -270,12 +270,9 @@ endif CGOFLAG_TSH ?= $(CGOFLAG) # -# 'make all' builds all 3 executables and places them in the current directory. +# 'make all' builds all 4 executables and places them in the current directory. # -# IMPORTANT: -# Unless called with the `WEBASSETS_TAG` env variable set to "webassets_embed" -# the binaries will not contain the web UI assets and `teleport` won't start -# without setting the environment variable DEBUG=1. +# NOTE: Works the same as `make`. Left for legacy reasons. .PHONY: all all: version @echo "---> Building OSS binaries." @@ -299,7 +296,7 @@ $(BUILDDIR)/tctl: .PHONY: $(BUILDDIR)/teleport $(BUILDDIR)/teleport: ensure-webassets bpf-bytecode rdpclient - GOOS=$(OS) GOARCH=$(ARCH) $(CGOFLAG) go build -tags "$(PAM_TAG) $(FIPS_TAG) $(BPF_TAG) $(WEBASSETS_TAG) $(RDPCLIENT_TAG) $(PIV_BUILD_TAG)" -o $(BUILDDIR)/teleport $(BUILDFLAGS) ./tool/teleport + GOOS=$(OS) GOARCH=$(ARCH) $(CGOFLAG) go build -tags "webassets_embed $(PAM_TAG) $(FIPS_TAG) $(BPF_TAG) $(WEBASSETS_TAG) $(RDPCLIENT_TAG) $(PIV_BUILD_TAG)" -o $(BUILDDIR)/teleport $(BUILDFLAGS) ./tool/teleport # NOTE: Any changes to the `tsh` build here must be copied to `windows.go` in Dronegen until # we can use this Makefile for native Windows builds. @@ -372,7 +369,7 @@ endif .PHONY:full full: ensure-webassets ifneq ("$(OS)", "windows") - $(MAKE) all WEBASSETS_TAG="webassets_embed" + $(MAKE) all endif # diff --git a/e b/e index 04605151e7b..ddba1f7d6f8 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit 04605151e7be43fb6831764153cf485e3a6a493f +Subproject commit ddba1f7d6f8c80e3569641d19a3c8598d8669cf6