From b2dd00dd5b83fc7e8b311a55f5a2536e4f3d45a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Wed, 7 Mar 2018 20:04:18 +0000
Subject: Adding enterprise commands support (#8327)

---
 build/release.mk | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'build')

diff --git a/build/release.mk b/build/release.mk
index 8bd4f9afd..568616ec3 100644
--- a/build/release.mk
+++ b/build/release.mk
@@ -3,15 +3,27 @@ dist: | check-style test package
 
 build-linux:
 	@echo Build Linux amd64
-	env GOOS=linux GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform
+ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
+	env GOOS=linux GOARCH=amd64 $(GO) build -i -o $(GOPATH)/bin/platform $(GOFLAGS) $(GO_LINKER_FLAGS) ./
+else
+	env GOOS=linux GOARCH=amd64 $(GO) build -i -o $(GOPATH)/bin/linux_amd64/platform $(GOFLAGS) $(GO_LINKER_FLAGS) ./
+endif
 
 build-osx: 
 	@echo Build OSX amd64
-	env GOOS=darwin GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform
+ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
+	env GOOS=darwin GOARCH=amd64 $(GO) build -i -o $(GOPATH)/bin/platform $(GOFLAGS) $(GO_LINKER_FLAGS) ./
+else
+	env GOOS=darwin GOARCH=amd64 $(GO) build -i -o $(GOPATH)/bin/darwin_amd64/platform $(GOFLAGS) $(GO_LINKER_FLAGS) ./
+endif
 
 build-windows: 
 	@echo Build Windows amd64
-	env GOOS=windows GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform
+ifeq ($(BUILDER_GOOS_GOARCH),"windows_amd64")
+	env GOOS=windows GOARCH=amd64 $(GO) build -i -o $(GOPATH)/bin/platform.exe $(GOFLAGS) $(GO_LINKER_FLAGS) ./
+else
+	env GOOS=windows GOARCH=amd64 $(GO) build -i -o $(GOPATH)/bin/windows_amd64/platform.exe $(GOFLAGS) $(GO_LINKER_FLAGS) ./
+endif
 
 build: build-linux build-windows build-osx
 
-- 
cgit v1.2.3-1-g7c22


From 46fea093c8d77da3f3a6e5417632ba686eef8092 Mon Sep 17 00:00:00 2001
From: Carlos Tadeu Panato Junior <ctadeu@gmail.com>
Date: Mon, 12 Mar 2018 12:39:06 +0100
Subject: using inbucket docker image tag release-1.2.0 instead of latest
 (#8406)

---
 build/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build')

diff --git a/build/Jenkinsfile b/build/Jenkinsfile
index ebef7ca3d..7eb2fda88 100644
--- a/build/Jenkinsfile
+++ b/build/Jenkinsfile
@@ -31,7 +31,7 @@ podTemplate(label: 'jenkins-slave',
         ),
         containerTemplate(
             name: 'mattermost-inbucket',
-            image: 'jhillyerd/inbucket:latest',
+            image: 'jhillyerd/inbucket:release-1.2.0',
             resourceRequestCpu: '250m',
             resourceLimitCpu: '250m',
             resourceRequestMemory: '256Mi',
-- 
cgit v1.2.3-1-g7c22