From c42c083b3730bf2399e4a5f308bed087c77a1e1d Mon Sep 17 00:00:00 2001
From: Stanislav Simovski <megakoresh@gmail.com>
Date: Sun, 9 Feb 2020 18:10:31 +0200
Subject: [PATCH] Switch prod build to official with multi-stage

Use aliases for copy statement (compat change)

Install missing dependencies to runner

Fixed typo
---
 Taskfile.yml                       |  4 ++--
 deployment/docker/ci/bin/install   |  1 -
 deployment/docker/prod/Dockerfile  | 28 ++++++++++++++++------------
 deployment/docker/prod/bin/install |  6 ------
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/Taskfile.yml b/Taskfile.yml
index fb8e02788..6b07a5798 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -57,10 +57,10 @@ tasks:
       - go install github.com/haya14busa/goverage
       - go install github.com/snikch/goodman/cmd/goodman
       - go install github.com/go-swagger/go-swagger/cmd/swagger
-      - '{{ if ne OS "windows" }} bash -c "curl -L https://github.com/goreleaser/goreleaser/releases/download/v{{ .GORELEASER_VERSION }}/goreleaser_$(uname -s)_$(uname -m).tar.gz | tar -xz -C $(go env GOPATH)/bin goreleaser"{{ else }} {{ end }}'
+      - '{{ if ne OS "windows" }} sh -c "curl -L https://github.com/goreleaser/goreleaser/releases/download/v{{ .GORELEASER_VERSION }}/goreleaser_$(uname -s)_$(uname -m).tar.gz | tar -xz -C $(go env GOPATH)/bin goreleaser"{{ else }} {{ end }}'
       - '{{ if ne OS "windows" }} chmod +x $(go env GOPATH)/bin/goreleaser{{ else }} {{ end }}'
       - '{{ if eq OS "windows" }} echo "NOTICE: You must download goreleaser manually to build this application https://github.com/goreleaser/goreleaser/releases "{{ else }}:{{ end }}'
-      - '{{ if ne OS "windows" }} bash -c "curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v{{ .GOLINTER_VERSION }}"{{ else }}{{ end }}'
+      - '{{ if ne OS "windows" }} sh -c "curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v{{ .GOLINTER_VERSION }}"{{ else }}{{ end }}'
       - '{{ if eq OS "windows" }} echo "NOTICE: You need to install golangci-lint manually to build this application https://github.com/golangci/golangci-lint#install"{{ else }}{{ end }}'
 
   compile:
diff --git a/deployment/docker/ci/bin/install b/deployment/docker/ci/bin/install
index c36f6d0ef..b7bb800c5 100755
--- a/deployment/docker/ci/bin/install
+++ b/deployment/docker/ci/bin/install
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-
 echo "--> Turn off StrictKeyChecking"
 cat > /etc/ssh/ssh_config <<EOF
 Host *
diff --git a/deployment/docker/prod/Dockerfile b/deployment/docker/prod/Dockerfile
index 9b0c9b682..d756ffe6b 100644
--- a/deployment/docker/prod/Dockerfile
+++ b/deployment/docker/prod/Dockerfile
@@ -1,26 +1,30 @@
 # ansible-semaphore production image
-#
-# Uses frolvlad alpine so we have access to glibc which is needed for golang
-# and when deploying in openshift
-FROM frolvlad/alpine-glibc:alpine-3.7
+FROM golang:1.13-alpine3.10 as builder
 
 LABEL maintainer="Tom Whiston <tom.whiston@gmail.com>"
 
-RUN apk add --no-cache git ansible mysql-client curl openssh-client tini && \
+COPY ./ /go/src/github.com/ansible-semaphore/semaphore
+WORKDIR /go/src/github.com/ansible-semaphore/semaphore
+
+RUN apk add --no-cache -U libc-dev curl nodejs npm git && \
+  ./deployment/docker/prod/bin/install
+
+# Uses frolvlad alpine so we have access to glibc which is needed for golang
+# and when deploying in openshift
+FROM frolvlad/alpine-glibc:alpine-3.10 as runner
+
+RUN apk add --no-cache git curl ansible mysql-client openssh-client tini && \
     adduser -D -u 1001 -G root semaphore && \
     mkdir -p /tmp/semaphore && \
     mkdir -p /etc/semaphore && \
     chown -R semaphore:0 /tmp/semaphore && \
     chown -R semaphore:0 /etc/semaphore
 
-COPY ./ /go/src/github.com/ansible-semaphore/semaphore
-WORKDIR /go/src/github.com/ansible-semaphore/semaphore
+COPY --from=builder /usr/local/bin/semaphore-wrapper /usr/local/bin/
+COPY --from=builder /usr/local/bin/semaphore /usr/local/bin/
 
-RUN apk add --no-cache -U libc-dev go nodejs && \
-  ./deployment/docker/prod/bin/install && \
-  apk del libc-dev go nodejs && \
-  rm -rf /go/* && \
-  rm -rf /var/cache/apk/*
+RUN chown -R semaphore:0 /usr/local/bin/semaphore-wrapper &&\
+    chown -R semaphore:0 /usr/local/bin/semaphore
 
 WORKDIR /home/semaphore
 USER 1001
diff --git a/deployment/docker/prod/bin/install b/deployment/docker/prod/bin/install
index b17138409..8da9bf8b2 100755
--- a/deployment/docker/prod/bin/install
+++ b/deployment/docker/prod/bin/install
@@ -2,12 +2,6 @@
 
 set -e
 
-# Go build environment
-export GOROOT=/usr/lib/go
-export GOPATH=/go
-export GOBIN=/go/bin
-export PATH="${PATH}:${GOBIN}"
-
 # Get prerequisites for building the app
 (cd $(go env GOPATH) && curl -sL https://taskfile.dev/install.sh | sh)