self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-20 17:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always include webassets_embed when building teleport (#21601)

Browse source 
* Always include webassets_embed when building teleport

Currently, all builds should include webassets, so we can just hanrdcode this tag.

* Update e
This commit is contained in:
Jakub Nyckowski 2023-02-10 14:15:54 -05:00 committed by GitHub
parent 2402509f33
commit 1f85417d60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -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
#

2
e

@ -1 +1 @@
Subproject commit 04605151e7be43fb6831764153cf485e3a6a493f
Subproject commit ddba1f7d6f8c80e3569641d19a3c8598d8669cf6