Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(ci): Correctly pass Version to Docker builds and remove Release Phase var #328

Merged
merged 3 commits into from
Mar 18, 2022
Merged

refactor(ci): Correctly pass Version to Docker builds and remove Release Phase var #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebb26cd
refactor(docker): Consolidate on single Dockerfile
kskewes-sf Mar 11, 2022
ff014d5
chore(ci): Remove redundant build.sh file
kskewes-sf Mar 11, 2022
54d4123
refactor(build): Remove Release Phase and only use Version
kskewes-sf Mar 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ ARG VERSION
WORKDIR /app
COPY ./ ./

RUN ./build.sh --go-os linux --go-arch amd64 --version "${VERSION:-}"
ENV LD_VERSION="-X github.com/spinnaker/spin/version.Version=${VERSION}"

RUN GOARCH=amd64 GOOS=linux CGO_ENABLED=0 go build \
-ldflags "${LD_VERSION}" .

FROM alpine

Expand Down
9 changes: 0 additions & 9 deletions Dockerfile.slim
View file
Open in desktop

This file was deleted.

83 changes: 0 additions & 83 deletions build.sh
View file
Open in desktop

This file was deleted.

14 changes: 1 addition & 13 deletions version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,13 @@

package version

import (
"fmt"
)

// Main version number being run right now.
var Version = ""

// A pre-release marker for the version. If this is an empty string,
// then the release is a final release. Otherwise this is a pre-release
// version e.g. "dev", "alpha", etc.
var ReleasePhase = "dev"
var Version = "dev"

// User Agent name set in requests.
const UserAgent = "Spin-CLI"

// String prints the version of the Spin CLI.
func String() string {
if ReleasePhase != "" {
return fmt.Sprintf("%s-%s", Version, ReleasePhase)
}
return Version
}