From 2c745fa68d2c81a686ef3e2b5cd366685ec1d681 Mon Sep 17 00:00:00 2001
From: Dan Sosedoff <dan.sosedoff@gmail.com>
Date: Tue, 6 Dec 2022 18:14:47 -0600
Subject: [PATCH] Use runtime-provided os/arch info

---
 Makefile               | 2 --
 pkg/command/version.go | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index db7f272..d392545 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 PKG = github.com/sosedoff/pgweb
 GIT_COMMIT ?= $(shell git rev-parse HEAD)
 BUILD_TIME ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ" | tr -d '\n')
-BUILD_ARCH ?= $(shell uname -s | awk '{print tolower($$0)}')/$(shell uname -m)
 GO_VERSION ?= $(shell go version | awk {'print $$3'})
 
 DOCKER_RELEASE_TAG = "sosedoff/pgweb:$(shell git describe --abbrev=0 --tags | sed 's/v//')"
@@ -10,7 +9,6 @@ DOCKER_LATEST_TAG = "sosedoff/pgweb:latest"
 LDFLAGS = -s -w
 LDFLAGS += -X $(PKG)/pkg/command.GitCommit=$(GIT_COMMIT)
 LDFLAGS += -X $(PKG)/pkg/command.BuildTime=$(BUILD_TIME)
-LDFLAGS += -X $(PKG)/pkg/command.BuildArch=$(BUILD_ARCH)
 LDFLAGS += -X $(PKG)/pkg/command.GoVersion=$(GO_VERSION)
 
 usage:
diff --git a/pkg/command/version.go b/pkg/command/version.go
index 92cb1cf..0ee6f57 100644
--- a/pkg/command/version.go
+++ b/pkg/command/version.go
@@ -2,6 +2,7 @@ package command
 
 import (
 	"fmt"
+	"runtime"
 	"strings"
 )
 
@@ -18,7 +19,7 @@ var (
 	BuildTime string
 
 	// BuildArch contains the OS architecture of the binary
-	BuildArch string
+	BuildArch string = fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH)
 
 	// GoVersion contains the build time Go version
 	GoVersion string
@@ -31,8 +32,8 @@ type VersionInfo struct {
 	Version   string `json:"version"`
 	GitCommit string `json:"git_sha"`
 	BuildTime string `json:"build_time"`
-	GoVersion string `json:"go_version"`
 	BuildArch string `json:"build_arch"`
+	GoVersion string `json:"go_version"`
 }
 
 func init() {