ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-06-05 01:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set GOARM separately for each architecture. Add changelog entries.

Browse Source
This commit is contained in:
Pablo Carranza Velez 2016-01-19 14:14:02 -03:00
parent 0125e86a6b
commit b17bd5bc27
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,4 +1,5 @@
* Set GOARM separately for each architecture [Pablo]
* Add armv5 (armel) build [Trong]
* Add OOM protection for the supervisor container, openvpn and connmand [Praneeth] * Add OOM protection for the supervisor container, openvpn and connmand [Praneeth]
# v1.3.2 # v1.3.2

5
Makefile
View File

@ -18,12 +18,15 @@ MIXPANEL_TOKEN = bananasbananas
ifeq ($(ARCH),rpi) ifeq ($(ARCH),rpi)
GOARCH = arm GOARCH = arm
GOARM = 6
endif endif
ifeq ($(ARCH),armv7hf) ifeq ($(ARCH),armv7hf)
GOARCH = arm GOARCH = arm
GOARM = 7
endif endif
ifeq ($(ARCH),armel) ifeq ($(ARCH),armel)
GOARCH = arm GOARCH = arm
GOARM = 5
endif endif
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
GOARCH = 386 GOARCH = 386
@ -80,7 +83,7 @@ go-builder:
gosuper: go-builder gosuper: go-builder
-mkdir -p bin -mkdir -p bin
-docker rm --volumes -f resin_build_gosuper_$(JOB_NAME) || true -docker rm --volumes -f resin_build_gosuper_$(JOB_NAME) || true
docker run --name resin_build_gosuper_$(JOB_NAME) -v $(shell pwd)/gosuper/bin:/usr/src/app/bin -e USER_ID=$(shell id -u) -e GROUP_ID=$(shell id -g) -e GOARCH=$(GOARCH) resin/go-supervisor-builder:$(SUPERVISOR_VERSION) docker run --name resin_build_gosuper_$(JOB_NAME) -v $(shell pwd)/gosuper/bin:/usr/src/app/bin -e USER_ID=$(shell id -u) -e GROUP_ID=$(shell id -g) -e GOARCH=$(GOARCH) -e GOARM=$(GOARM) resin/go-supervisor-builder:$(SUPERVISOR_VERSION)
docker rm --volumes -f resin_build_gosuper_$(JOB_NAME) docker rm --volumes -f resin_build_gosuper_$(JOB_NAME)
mv gosuper/bin/linux_$(GOARCH)/gosuper bin/gosuper mv gosuper/bin/linux_$(GOARCH)/gosuper bin/gosuper

2
gosuper/Dockerfile
View File

@ -2,8 +2,6 @@ FROM golang:1.5.1
ENV GOOS linux ENV GOOS linux
ENV GOPATH /usr/src/app ENV GOPATH /usr/src/app
# Set an explicit GOARM of 5 for maximum compatibility
ENV GOARM 5
WORKDIR /usr/src/app WORKDIR /usr/src/app