go/golang-saas-starter-kit
1
0
Fork 0
mirror of https://github.com/raseels-repos/golang-saas-starter-kit.git synced 2025-08-08 22:36:41 +02:00
Code Issues Releases Activity

switch devops docker stage to use busybox instead of scratch

Browse Source
This commit is contained in:
Lee Brown
2019-08-06 19:45:29 -08:00
parent 3bb152a146
commit 69a2a40369
6 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/web-api/docs/docs.go
View File

@@ -2211,13 +2211,13 @@ type swaggerInfo struct {
}
// SwaggerInfo holds exported Swagger Info so clients can modify it
var SwaggerInfo = swaggerInfo{ Schemes: []string{}}
var SwaggerInfo = swaggerInfo{Schemes: []string{}}
type s struct{}
func (s *s) ReadDoc() string {
t, err := template.New("swagger_info").Funcs(template.FuncMap{
"marshal": func(v interface {}) string {
"marshal": func(v interface{}) string {
a, _ := json.Marshal(v)
return string(a)
},

28
cmd/web-api/handlers/check.go
View File

@@ -35,22 +35,22 @@ func (c *Check) Health(ctx context.Context, w http.ResponseWriter, r *http.Reque
}
data := struct {
Status string `json:"status"`
CiCommitRefName string `json:"ci-commit-ref-name,omitempty"`
Status string `json:"status"`
CiCommitRefName string `json:"ci-commit-ref-name,omitempty"`
CiCommitShortSha string `json:"ci-commit-short-sha,omitempty"`
CiCommitSha string `json:"ci-commit-sha,omitempty"`
CiCommitTag string `json:"ci-commit-tag,omitempty"`
CiCommitTitle string `json:"ci-commit-title,omitempty"`
CiJobId string `json:"ci-commit-job-id,omitempty"`
CiPipelineId string `json:"ci-commit-pipeline-id,omitempty"`
CiCommitSha string `json:"ci-commit-sha,omitempty"`
CiCommitTag string `json:"ci-commit-tag,omitempty"`
CiCommitTitle string `json:"ci-commit-title,omitempty"`
CiJobId string `json:"ci-commit-job-id,omitempty"`
CiPipelineId string `json:"ci-commit-pipeline-id,omitempty"`
}{
Status: "ok",
CiCommitRefName: os.Getenv("CI_COMMIT_REF_NAME"),
CiCommitShortSha : os.Getenv("CI_COMMIT_SHORT_SHA"),
CiCommitSha: os.Getenv("CI_COMMIT_SHA"),
CiCommitTag: os.Getenv("CI_COMMIT_TAG"),
CiJobId: os.Getenv("CI_JOB_ID"),
CiPipelineId: os.Getenv("CI_PIPELINE_ID"),
Status: "ok",
CiCommitRefName: os.Getenv("CI_COMMIT_REF_NAME"),
CiCommitShortSha: os.Getenv("CI_COMMIT_SHORT_SHA"),
CiCommitSha: os.Getenv("CI_COMMIT_SHA"),
CiCommitTag: os.Getenv("CI_COMMIT_TAG"),
CiJobId: os.Getenv("CI_JOB_ID"),
CiPipelineId: os.Getenv("CI_PIPELINE_ID"),
}
return web.RespondJson(ctx, w, data, http.StatusOK)

16
cmd/web-api/main.go
View File

@@ -133,14 +133,14 @@ func main() {
KeyExpiration time.Duration `default:"3600s" envconfig:"KEY_EXPIRATION"`
}
BuildInfo struct {
CiCommitRefName string `envconfig:"CI_COMMIT_REF_NAME"`
CiCommitShortSha string `envconfig:"CI_COMMIT_SHORT_SHA"`
CiCommitSha string `envconfig:"CI_COMMIT_SHA"`
CiCommitTag string `envconfig:"CI_COMMIT_TAG"`
CiJobId string `envconfig:"CI_JOB_ID"`
CiJobUrl string `envconfig:"CI_JOB_URL"`
CiPipelineId string `envconfig:"CI_PIPELINE_ID"`
CiPipelineUrl string `envconfig:"CI_PIPELINE_URL"`
CiCommitRefName string `envconfig:"CI_COMMIT_REF_NAME"`
CiCommitShortSha string `envconfig:"CI_COMMIT_SHORT_SHA"`
CiCommitSha string `envconfig:"CI_COMMIT_SHA"`
CiCommitTag string `envconfig:"CI_COMMIT_TAG"`
CiJobId string `envconfig:"CI_JOB_ID"`
CiJobUrl string `envconfig:"CI_JOB_URL"`
CiPipelineId string `envconfig:"CI_PIPELINE_ID"`
CiPipelineUrl string `envconfig:"CI_PIPELINE_URL"`
}
}

28
cmd/web-app/handlers/check.go
View File

@@ -35,22 +35,22 @@ func (c *Check) Health(ctx context.Context, w http.ResponseWriter, r *http.Reque
}
data := struct {
Status string `json:"status"`
CiCommitRefName string `json:"ci-commit-ref-name,omitempty"`
Status string `json:"status"`
CiCommitRefName string `json:"ci-commit-ref-name,omitempty"`
CiCommitShortSha string `json:"ci-commit-short-sha,omitempty"`
CiCommitSha string `json:"ci-commit-sha,omitempty"`
CiCommitTag string `json:"ci-commit-tag,omitempty"`
CiCommitTitle string `json:"ci-commit-title,omitempty"`
CiJobId string `json:"ci-commit-job-id,omitempty"`
CiPipelineId string `json:"ci-commit-pipeline-id,omitempty"`
CiCommitSha string `json:"ci-commit-sha,omitempty"`
CiCommitTag string `json:"ci-commit-tag,omitempty"`
CiCommitTitle string `json:"ci-commit-title,omitempty"`
CiJobId string `json:"ci-commit-job-id,omitempty"`
CiPipelineId string `json:"ci-commit-pipeline-id,omitempty"`
}{
Status: "ok",
CiCommitRefName: os.Getenv("CI_COMMIT_REF_NAME"),
CiCommitShortSha : os.Getenv("CI_COMMIT_SHORT_SHA"),
CiCommitSha: os.Getenv("CI_COMMIT_SHA"),
CiCommitTag: os.Getenv("CI_COMMIT_TAG"),
CiJobId: os.Getenv("CI_JOB_ID"),
CiPipelineId: os.Getenv("CI_PIPELINE_ID"),
Status: "ok",
CiCommitRefName: os.Getenv("CI_COMMIT_REF_NAME"),
CiCommitShortSha: os.Getenv("CI_COMMIT_SHORT_SHA"),
CiCommitSha: os.Getenv("CI_COMMIT_SHA"),
CiCommitTag: os.Getenv("CI_COMMIT_TAG"),
CiJobId: os.Getenv("CI_JOB_ID"),
CiPipelineId: os.Getenv("CI_PIPELINE_ID"),
}
return web.RespondJson(ctx, w, data, http.StatusOK)

16
cmd/web-app/main.go
View File

@@ -150,14 +150,14 @@ func main() {
Pass string `default:"" envconfig:"PASS" json:"-"` // don't print
}
BuildInfo struct {
CiCommitRefName string `envconfig:"CI_COMMIT_REF_NAME"`
CiCommitShortSha string `envconfig:"CI_COMMIT_SHORT_SHA"`
CiCommitSha string `envconfig:"CI_COMMIT_SHA"`
CiCommitTag string `envconfig:"CI_COMMIT_TAG"`
CiJobId string `envconfig:"CI_JOB_ID"`
CiJobUrl string `envconfig:"CI_JOB_URL"`
CiPipelineId string `envconfig:"CI_PIPELINE_ID"`
CiPipelineUrl string `envconfig:"CI_PIPELINE_URL"`
CiCommitRefName string `envconfig:"CI_COMMIT_REF_NAME"`
CiCommitShortSha string `envconfig:"CI_COMMIT_SHORT_SHA"`
CiCommitSha string `envconfig:"CI_COMMIT_SHA"`
CiCommitTag string `envconfig:"CI_COMMIT_TAG"`
CiJobId string `envconfig:"CI_JOB_ID"`
CiJobUrl string `envconfig:"CI_JOB_URL"`
CiPipelineId string `envconfig:"CI_PIPELINE_ID"`
CiPipelineUrl string `envconfig:"CI_PIPELINE_URL"`
}
}

2
tools/devops/Dockerfile
View File

@@ -21,7 +21,7 @@ WORKDIR ./tools/devops
RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix nocgo -o /go/bin/devops .
FROM scratch
FROM busybox
COPY --from=builder /go/bin/devops /go/bin/devops