Skip to content

Commit

Permalink
Merge pull request #96 from replicatedhq/build-fix
Browse files Browse the repository at this point in the history
Build fix
  • Loading branch information
marccampbell committed Dec 18, 2019
2 parents 7f82ec1 + 59a2281 commit fd47d23
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 124 deletions.
39 changes: 0 additions & 39 deletions deploy/.goreleaser.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,6 @@ release:
owner: replicatedhq
name: troubleshoot
builds:
- id: collector
goos:
- linux
goarch:
- amd64
env:
- CGO_ENABLED=0
main: cmd/collector/main.go
ldflags: -s -w
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
-extldflags "-static"
flags: -tags netgo -installsuffix netgo
binary: collector
hooks: {}
- id: preflight
goos:
- linux
Expand Down Expand Up @@ -52,22 +36,6 @@ builds:
flags: -tags netgo -installsuffix netgo
binary: support-bundle
hooks: {}
- id: manager
goos:
- linux
goarch:
- amd64
env:
- CGO_ENABLED=0
main: cmd/manager/main.go
ldflags: -s -w
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
-extldflags "-static"
flags: -tags netgo -installsuffix netgo
binary: manager
hooks: {}
archives:
- id: tar
format: tar.gz
Expand All @@ -86,20 +54,13 @@ dockers:
image_templates:
- "replicated/troubleshoot:alpha"
binaries:
- collector
- support-bundle
- preflight
- dockerfile: ./deploy/Dockerfile.troubleshoot
image_templates:
- "replicated/preflight:alpha"
binaries:
- collector
- support-bundle
- preflight
- dockerfile: ./deploy/Dockerfile.manager
image_templates:
- "replicated/troubleshoot-manager:alpha"
binaries:
- manager
snapshot:
name_template: SNAPSHOT-{{ .Commit }}
39 changes: 0 additions & 39 deletions deploy/.goreleaser.snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,6 @@ builds:
flags: -buildmode=c-shared
binary: troubleshoot.so
hooks: {}
- id: collector
goos:
- linux
goarch:
- amd64
env:
- CGO_ENABLED=0
main: cmd/collector/main.go
ldflags: -s -w
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
-extldflags "-static"
flags: -tags netgo -installsuffix netgo
binary: collector
hooks: {}
- id: preflight
goos:
- linux
Expand Down Expand Up @@ -68,22 +52,6 @@ builds:
flags: -tags netgo -installsuffix netgo
binary: support-bundle
hooks: {}
- id: manager
goos:
- linux
goarch:
- amd64
env:
- CGO_ENABLED=0
main: cmd/manager/main.go
ldflags: -s -w
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
-extldflags "-static"
flags: -tags netgo -installsuffix netgo
binary: manager
hooks: {}
archives:
- id: so
builds:
Expand All @@ -106,20 +74,13 @@ dockers:
image_templates:
- "replicated/troubleshoot:alpha"
binaries:
- collector
- support-bundle
- preflight
- dockerfile: ./deploy/Dockerfile.troubleshoot
image_templates:
- "replicated/preflight:alpha"
binaries:
- collector
- support-bundle
- preflight
- dockerfile: ./deploy/Dockerfile.manager
image_templates:
- "replicated/troubleshoot-manager:alpha"
binaries:
- manager
snapshot:
name_template: SNAPSHOT-{{ .Commit }}
42 changes: 0 additions & 42 deletions deploy/.goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,6 @@ builds:
flags: -buildmode=c-shared
binary: troubleshoot.so
hooks: {}
- id: collector
goos:
- linux
goarch:
- amd64
env:
- CGO_ENABLED=0
main: cmd/collector/main.go
ldflags: -s -w
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
-extldflags "-static"
flags: -tags netgo -installsuffix netgo
binary: collector
hooks: {}
- id: preflight
goos:
- linux
Expand Down Expand Up @@ -68,22 +52,6 @@ builds:
flags: -tags netgo -installsuffix netgo
binary: support-bundle
hooks: {}
- id: manager
goos:
- linux
goarch:
- amd64
env:
- CGO_ENABLED=0
main: cmd/manager/main.go
ldflags: -s -w
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
-extldflags "-static"
flags: -tags netgo -installsuffix netgo
binary: manager
hooks: {}
archives:
- id: so
builds:
Expand Down Expand Up @@ -132,7 +100,6 @@ dockers:
- "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}"
- "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
binaries:
- collector
- support-bundle
- preflight
- dockerfile: ./deploy/Dockerfile.troubleshoot
Expand All @@ -142,14 +109,5 @@ dockers:
- "replicated/preflight:{{ .Major }}.{{ .Minor }}"
- "replicated/preflight:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
binaries:
- collector
- support-bundle
- preflight
- dockerfile: ./deploy/Dockerfile.manager
image_templates:
- "replicated/troubleshoot-manager:latest"
- "replicated/troubleshoot-manager:{{ .Major }}"
- "replicated/troubleshoot-manager:{{ .Major }}.{{ .Minor }}"
- "replicated/troubleshoot-manager:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
binaries:
- manager
4 changes: 0 additions & 4 deletions deploy/Dockerfile.manager

This file was deleted.

0 comments on commit fd47d23

Please sign in to comment.