From dbd08d0e1119bc3ea55efedcd5a942bd62898f90 Mon Sep 17 00:00:00 2001
From: Matt Snook <37818548+msnook@users.noreply.github.com>
Date: Wed, 31 Oct 2018 16:20:20 -0400
Subject: [PATCH] BCDA-353: Update rpm packaging so that we are using Debian
 container instead of Alpine container. (#61)

---
 Dockerfiles/Dockerfile.package | 7 +++----
 ops/build_and_package.sh       | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Dockerfiles/Dockerfile.package b/Dockerfiles/Dockerfile.package
index b02de1b24..737c6df99 100644
--- a/Dockerfiles/Dockerfile.package
+++ b/Dockerfiles/Dockerfile.package
@@ -1,8 +1,7 @@
-FROM golang:1.10-alpine3.8
+FROM golang:1.10
 
-RUN apk upgrade
-RUN apk update
-RUN apk add --no-cache gcc make ruby ruby-dev rpm libc-dev git
+RUN apt-get update
+RUN apt-get install -y build-essential ruby ruby-dev rpm git
 RUN gem install --no-ri --no-rdoc fpm etc
 RUN go get -u github.com/golang/dep/cmd/dep
 
diff --git a/ops/build_and_package.sh b/ops/build_and_package.sh
index 58dae40e1..1e4aaa8d9 100755
--- a/ops/build_and_package.sh
+++ b/ops/build_and_package.sh
@@ -19,11 +19,11 @@ go clean
 echo "Building bcda binary..." 
 go build -ldflags "-X main.version=$VERSION"
 echo "Packaging bcda binary into RPM..."
-fpm -v $VERSION -s dir -t rpm -n bcda bcda
+fpm -v $VERSION -s dir -t rpm -n bcda bcda=/usr/local/bin/bcda
 cd ../bcdaworker
 go clean 
 echo "Building bcdaworker..."
 go build
 echo "Packaging bcdaworker binary into RPM..."
-fpm -v $VERSION -s dir -t rpm -n bcdaworker bcdaworker
+fpm -v $VERSION -s dir -t rpm -n bcdaworker bcdaworker=/usr/local/bin/bcdaworker