Skip to content

Commit fd47d23

Browse files
authored
Merge pull request #96 from replicatedhq/build-fix
Build fix
2 parents 7f82ec1 + 59a2281 commit fd47d23

File tree

4 files changed

+0
-124
lines changed

4 files changed

+0
-124
lines changed

deploy/.goreleaser.local.yml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,6 @@ release:
44
owner: replicatedhq
55
name: troubleshoot
66
builds:
7-
- id: collector
8-
goos:
9-
- linux
10-
goarch:
11-
- amd64
12-
env:
13-
- CGO_ENABLED=0
14-
main: cmd/collector/main.go
15-
ldflags: -s -w
16-
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
17-
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
18-
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
19-
-extldflags "-static"
20-
flags: -tags netgo -installsuffix netgo
21-
binary: collector
22-
hooks: {}
237
- id: preflight
248
goos:
259
- linux
@@ -52,22 +36,6 @@ builds:
5236
flags: -tags netgo -installsuffix netgo
5337
binary: support-bundle
5438
hooks: {}
55-
- id: manager
56-
goos:
57-
- linux
58-
goarch:
59-
- amd64
60-
env:
61-
- CGO_ENABLED=0
62-
main: cmd/manager/main.go
63-
ldflags: -s -w
64-
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
65-
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
66-
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
67-
-extldflags "-static"
68-
flags: -tags netgo -installsuffix netgo
69-
binary: manager
70-
hooks: {}
7139
archives:
7240
- id: tar
7341
format: tar.gz
@@ -86,20 +54,13 @@ dockers:
8654
image_templates:
8755
- "replicated/troubleshoot:alpha"
8856
binaries:
89-
- collector
9057
- support-bundle
9158
- preflight
9259
- dockerfile: ./deploy/Dockerfile.troubleshoot
9360
image_templates:
9461
- "replicated/preflight:alpha"
9562
binaries:
96-
- collector
9763
- support-bundle
9864
- preflight
99-
- dockerfile: ./deploy/Dockerfile.manager
100-
image_templates:
101-
- "replicated/troubleshoot-manager:alpha"
102-
binaries:
103-
- manager
10465
snapshot:
10566
name_template: SNAPSHOT-{{ .Commit }}

deploy/.goreleaser.snapshot.yml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,6 @@ builds:
1616
flags: -buildmode=c-shared
1717
binary: troubleshoot.so
1818
hooks: {}
19-
- id: collector
20-
goos:
21-
- linux
22-
goarch:
23-
- amd64
24-
env:
25-
- CGO_ENABLED=0
26-
main: cmd/collector/main.go
27-
ldflags: -s -w
28-
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
29-
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
30-
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
31-
-extldflags "-static"
32-
flags: -tags netgo -installsuffix netgo
33-
binary: collector
34-
hooks: {}
3519
- id: preflight
3620
goos:
3721
- linux
@@ -68,22 +52,6 @@ builds:
6852
flags: -tags netgo -installsuffix netgo
6953
binary: support-bundle
7054
hooks: {}
71-
- id: manager
72-
goos:
73-
- linux
74-
goarch:
75-
- amd64
76-
env:
77-
- CGO_ENABLED=0
78-
main: cmd/manager/main.go
79-
ldflags: -s -w
80-
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
81-
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
82-
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
83-
-extldflags "-static"
84-
flags: -tags netgo -installsuffix netgo
85-
binary: manager
86-
hooks: {}
8755
archives:
8856
- id: so
8957
builds:
@@ -106,20 +74,13 @@ dockers:
10674
image_templates:
10775
- "replicated/troubleshoot:alpha"
10876
binaries:
109-
- collector
11077
- support-bundle
11178
- preflight
11279
- dockerfile: ./deploy/Dockerfile.troubleshoot
11380
image_templates:
11481
- "replicated/preflight:alpha"
11582
binaries:
116-
- collector
11783
- support-bundle
11884
- preflight
119-
- dockerfile: ./deploy/Dockerfile.manager
120-
image_templates:
121-
- "replicated/troubleshoot-manager:alpha"
122-
binaries:
123-
- manager
12485
snapshot:
12586
name_template: SNAPSHOT-{{ .Commit }}

deploy/.goreleaser.yml

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,6 @@ builds:
1616
flags: -buildmode=c-shared
1717
binary: troubleshoot.so
1818
hooks: {}
19-
- id: collector
20-
goos:
21-
- linux
22-
goarch:
23-
- amd64
24-
env:
25-
- CGO_ENABLED=0
26-
main: cmd/collector/main.go
27-
ldflags: -s -w
28-
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
29-
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
30-
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
31-
-extldflags "-static"
32-
flags: -tags netgo -installsuffix netgo
33-
binary: collector
34-
hooks: {}
3519
- id: preflight
3620
goos:
3721
- linux
@@ -68,22 +52,6 @@ builds:
6852
flags: -tags netgo -installsuffix netgo
6953
binary: support-bundle
7054
hooks: {}
71-
- id: manager
72-
goos:
73-
- linux
74-
goarch:
75-
- amd64
76-
env:
77-
- CGO_ENABLED=0
78-
main: cmd/manager/main.go
79-
ldflags: -s -w
80-
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
81-
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
82-
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
83-
-extldflags "-static"
84-
flags: -tags netgo -installsuffix netgo
85-
binary: manager
86-
hooks: {}
8755
archives:
8856
- id: so
8957
builds:
@@ -132,7 +100,6 @@ dockers:
132100
- "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}"
133101
- "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
134102
binaries:
135-
- collector
136103
- support-bundle
137104
- preflight
138105
- dockerfile: ./deploy/Dockerfile.troubleshoot
@@ -142,14 +109,5 @@ dockers:
142109
- "replicated/preflight:{{ .Major }}.{{ .Minor }}"
143110
- "replicated/preflight:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
144111
binaries:
145-
- collector
146112
- support-bundle
147113
- preflight
148-
- dockerfile: ./deploy/Dockerfile.manager
149-
image_templates:
150-
- "replicated/troubleshoot-manager:latest"
151-
- "replicated/troubleshoot-manager:{{ .Major }}"
152-
- "replicated/troubleshoot-manager:{{ .Major }}.{{ .Minor }}"
153-
- "replicated/troubleshoot-manager:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
154-
binaries:
155-
- manager

deploy/Dockerfile.manager

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)