Skip to content

Commit

Permalink
Merge pull request choria-io#83 from traylenator/go16
Browse files Browse the repository at this point in the history
(misc) Use go 1.16 consistantly in build and build on Podman as well
  • Loading branch information
ripienaar authored Apr 16, 2021
2 parents 0c7bd17 + 991347b commit 800b8cb
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ end
desc "Builds packages"
task :build do
version = ENV["VERSION"] || "0.0.0"
docker_socket = ENV["DOCKER_SOCKET"] || "/var/run/docker.sock"
sha = `git rev-parse --short HEAD`.chomp
build = ENV["BUILD"] || "foss"
packages = (ENV["PACKAGES"] || "").split(",")
Expand All @@ -30,7 +31,8 @@ task :build do
builder = "choria/packager:el7-go1.16"
end

sh 'docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v `pwd`:%s -e SOURCE_DIR=%s -e ARTIFACTS=%s -e SHA1="%s" -e BUILD="%s" -e VERSION="%s" -e PACKAGE=%s %s' % [
sh 'docker run --rm -v %s:/var/run/docker.sock -v `pwd`:%s:Z -e SOURCE_DIR=%s -e ARTIFACTS=%s -e SHA1="%s" -e BUILD="%s" -e VERSION="%s" -e PACKAGE=%s %s' % [
docker_socket,
source,
source,
source,
Expand All @@ -51,7 +53,7 @@ task :build_binaries do

source = "/go/src/github.com/choria-io/aaasvc"

sh 'docker run --rm -v `pwd`:%s -e SOURCE_DIR=%s -e ARTIFACTS=%s -e SHA1="%s" -e BUILD="%s" -e VERSION="%s" -e BINARY_ONLY=1 choria/packager:el7-go13' % [
sh 'docker run --rm -v `pwd`:%s:Z -e SOURCE_DIR=%s -e ARTIFACTS=%s -e SHA1="%s" -e BUILD="%s" -e VERSION="%s" -e BINARY_ONLY=1 choria/packager:el7-go1.16' % [
source,
source,
source,
Expand Down

0 comments on commit 800b8cb

Please sign in to comment.