Merge pull request #285 from joyent/sungo/dockerfile-release-user-fix

Various fixes to the release process

Author: sungo

Dockerfile.release

@@ -7,16 +7,14 @@ RUN apk add --no-cache --update make git perl-utils dep shadow
 ARG UID="1000"
 ARG BRANCH="master"
 
-RUN adduser -D -u $UID app
-
 ENV GOPATH "/home/app/go"
 ENV PATH "${GOPATH}/bin:${PATH}"
 ENV GOCACHE "/home/app/.cache"
 
 RUN mkdir -p "${GOPATH}/src/github.com/joyent/"
-RUN chown -R app /home/app
+RUN chown -R $UID /home/app
 
-USER app
+USER $UID
 
 WORKDIR "${GOPATH}/src/github.com/joyent/"
 RUN git clone --branch $BRANCH https://github.com/joyent/conch-shell conch-shell

Makefile

@@ -42,9 +42,10 @@ tools: ## Download and install all dev/code tools
 
 PLATFORMS  := darwin-amd64 linux-amd64 solaris-amd64 freebsd-amd64 openbsd-amd64 linux-arm
 BINARIES   := conch conch-minimal tester corpus
+RELEASE_BINARIES := conch
 
 BINS       := $(foreach bin,$(BINARIES),bin/$(bin)) 
-RELEASES   := $(foreach bin,$(BINARIES),release/$(bin))
+RELEASES   := $(foreach bin,$(RELEASE_BINARIES),release/$(bin))
 
 GIT_REV    := $(shell git describe --always --abbrev --dirty --long)
 FLAGS_PATH := github.com/joyent/conch-shell/pkg/util
@@ -71,7 +72,7 @@ define release_me
 	$(eval GOARCH:=$(call arch, $(platform)))
 	$(eval RPATH:=release/$(BIN)-$(GOOS)-$(GOARCH))
 
-	$(BUILD) -o $(RPATH) cmd/$(BIN)/*.go
+	GOOS=$(GOOS) GOARCH=$(GOARCH) $(BUILD) -o $(RPATH) cmd/$(BIN)/*.go
 	shasum -a 256 $(RPATH) > $(RPATH).sha256
 endef