Merge pull request #243 from gobuffalo/task-updating-version-number

task: tweaking docker build to add the version number
gobuffalo · Nov 19, 2022 · 1bcddd6 · 1bcddd6
2 parents 365023a + 3cab540
commit 1bcddd6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/Dockerfile.build b/Dockerfile.build
@@ -1,8 +1,7 @@
 FROM golang:1.18
 
 EXPOSE 3000
-
-ENV GOPROXY=https://proxy.golang.org
+ARG DOCKER_TAG
 
 RUN apt-get update \
     && apt-get install -y -q build-essential sqlite3 libsqlite3-dev postgresql libpq-dev vim
@@ -32,7 +31,7 @@ RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.s
 # Installing buffalo binary
 WORKDIR /cli
 ADD . .
-RUN go install ./cmd/buffalo
+RUN go install -ldflags="-X 'github.com/gobuffalo/cli/internal/runtime.Version=${DOCKER_TAG}'" ./cmd/buffalo 
 
 WORKDIR /
 RUN go install github.com/gobuffalo/buffalo-pop/v3@latest

diff --git a/Dockerfile.slim.build b/Dockerfile.slim.build
@@ -2,7 +2,7 @@ FROM golang:1.18-alpine
 
 EXPOSE 3000
 
-ENV GOPROXY=https://proxy.golang.org 
+ARG DOCKER_TAG
 
 RUN apk add --no-cache --upgrade apk-tools \
     && apk add --no-cache bash curl openssl git build-base nodejs npm sqlite sqlite-dev mysql-client vim postgresql libpq postgresql-contrib libc6-compat
@@ -19,7 +19,7 @@ RUN npm i -g --no-progress yarn \
 # Installing buffalo binary
 WORKDIR /cli
 ADD . .
-RUN go install ./cmd/buffalo
+RUN go install -ldflags="-X 'github.com/gobuffalo/cli/internal/runtime.Version=${DOCKER_TAG}'" ./cmd/buffalo 
 
 WORKDIR /
 RUN go install github.com/gobuffalo/buffalo-pop/v3@latest

diff --git a/buffalo b/buffalo
diff --git a/internal/runtime/version.go b/internal/runtime/version.go
@@ -1,4 +1,4 @@
 package runtime
 
 // Version is the current version of the buffalo binary
-var Version = "v0.18.7"
+var Version = "v0.18.9"