Dockerfile: Add version build argument (sqlc-dev#487)

hayama-junpei · May 12, 2020 · d51baf2 · d51baf2
1 parent 0a44cd1
commit d51baf2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,8 +6,10 @@ WORKDIR /workspace
 
 ARG github_ref
 ARG github_sha
+ARG version
 ENV GITHUB_REF=$github_ref
 ENV GITHUB_SHA=$github_sha
+ENV VERSION=$version
 RUN go run scripts/release.go -docker
 
 # STEP 2: Build a tiny image

diff --git a/scripts/release.go b/scripts/release.go
@@ -14,20 +14,24 @@ func main() {
 	docker := flag.Bool("docker", false, "create a docker release")
 	flag.Parse()
 
+	version := os.Getenv("VERSION")
 	sha := os.Getenv("GITHUB_SHA")
 	ref := os.Getenv("GITHUB_REF")
-	cmd := exec.Command("git", "show", "--no-patch", "--no-notes", "--pretty=%ci", sha)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		log.Println(strings.TrimSpace(string(out)))
-		log.Fatal(err)
-	}
 
-	var date string
-	parts := strings.Split(string(out), " ")
-	date = strings.Replace(parts[0]+parts[1], "-", "", -1)
-	date = strings.Replace(date, ":", "", -1)
-	version := fmt.Sprintf("v0.0.0-%s-%s", date, sha[:12])
+	if version == "" {
+		cmd := exec.Command("git", "show", "--no-patch", "--no-notes", "--pretty=%ci", sha)
+		out, err := cmd.CombinedOutput()
+		if err != nil {
+			log.Println(strings.TrimSpace(string(out)))
+			log.Fatal(err)
+		}
+
+		var date string
+		parts := strings.Split(string(out), " ")
+		date = strings.Replace(parts[0]+parts[1], "-", "", -1)
+		date = strings.Replace(date, ":", "", -1)
+		version = fmt.Sprintf("v0.0.0-%s-%s", date, sha[:12])
+	}
 
 	if *docker {
 		x := "-extldflags \"-static\" -X github.com/kyleconroy/sqlc/internal/cmd.version=" + version
@@ -38,9 +42,9 @@ func main() {
 			"-o", "/workspace/sqlc",
 			"./cmd/sqlc",
 		}
-		cmd = exec.Command("go", args...)
+		cmd := exec.Command("go", args...)
 		cmd.Env = os.Environ()
-		out, err = cmd.CombinedOutput()
+		out, err := cmd.CombinedOutput()
 		if err != nil {
 			log.Println(strings.TrimSpace(string(out)))
 			log.Fatal(err)
@@ -83,9 +87,9 @@ func main() {
 	}...)
 
 	log.Printf("Releasing %s on channel %s", flag.Arg(0), channel)
-	cmd = exec.Command(xname, args...)
+	cmd := exec.Command(xname, args...)
 	cmd.Env = os.Environ()
-	out, err = cmd.CombinedOutput()
+	out, err := cmd.CombinedOutput()
 	if err != nil {
 		log.Println(strings.TrimSpace(string(out)))
 		log.Fatal(err)