Fix docker build, add GOBINARY flag for make

GOBINARY defaults to "go", but if you want to build on a normal system,
you'll likely set it to go1.16rc1 with "make all GOBINARY=go1.16rc1".
This commit is contained in:
Harvey Tindall 2021-02-01 20:55:17 +00:00
parent ee37588959
commit 98a9e20cc0
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
3 changed files with 7 additions and 10 deletions

View File

@ -45,10 +45,6 @@ archives:
linux: Linux
windows: Windows
amd64: x86_64
files:
- data/*
- data/**/*
- data/**/**/*
checksum:
name_template: 'checksums.txt'
snapshot:

View File

@ -1,4 +1,4 @@
FROM golang:latest AS build
FROM golang:1.16rc1-buster AS build
COPY . /opt/build
@ -6,10 +6,10 @@ RUN apt update -y \
&& apt install build-essential python3-pip curl software-properties-common sed upx -y \
&& (curl -sL https://deb.nodesource.com/setup_14.x | bash -) \
&& apt install nodejs \
&& (cd /opt/build; make all GOESBUILD=on; make compress) \
&& (cd /opt/build; make all-external GOESBUILD=on; make compress) \
&& sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html
FROM golang:latest
FROM golang:1.16rc1-buster
COPY --from=build /opt/build/build /opt/jfa-go

View File

@ -4,6 +4,7 @@ ifeq ($(GOESBUILD), on)
else
ESBUILD := npx esbuild
endif
GOBINARY ?= go
npm:
$(info installing npm dependencies)
@ -43,7 +44,7 @@ ts-debug:
cp -r ts data/web/js
swagger:
go1.16rc1 get github.com/swaggo/swag/cmd/swag
$(GOBINARY) get github.com/swaggo/swag/cmd/swag
swag init -g main.go
version:
@ -51,10 +52,10 @@ version:
compile:
$(info Downloading deps)
go1.16rc1 mod download
$(GOBINARY) mod download
$(info Building)
mkdir -p build
cd build && CGO_ENABLED=0 go1.16rc1 build -o ./jfa-go ../*.go
cd build && CGO_ENABLED=0 $(GOBINARY) build -o ./jfa-go ../*.go
compress:
upx --lzma build/jfa-go